diff --git a/src/shared/gearbox/w_displacer.c b/src/shared/gearbox/w_displacer.c index cd78146d..8e89333d 100644 --- a/src/shared/gearbox/w_displacer.c +++ b/src/shared/gearbox/w_displacer.c @@ -190,7 +190,8 @@ w_displacer_release(void) return; } - if (random() < 0.5) { + int r = (float)input_sequence % 3; + if (r == 1) { Weapons_ViewAnimation(DISP_IDLE1); } else { Weapons_ViewAnimation(DISP_IDLE2); diff --git a/src/shared/gearbox/w_eagle.c b/src/shared/gearbox/w_eagle.c index e064d8c2..3036a757 100644 --- a/src/shared/gearbox/w_eagle.c +++ b/src/shared/gearbox/w_eagle.c @@ -122,8 +122,24 @@ w_eagle_release(void) } #endif - Weapons_ViewAnimation(EAGLE_IDLE1 + floor(random(0,5))); - pl.w_idle_next = 15.0f; + int r = (float)input_sequence % 4; + switch (r) { + case 0: + Weapons_ViewAnimation(EAGLE_IDLE1); + pl.w_idle_next = 2.5f; + break; + case 1: + Weapons_ViewAnimation(EAGLE_IDLE2); + pl.w_idle_next = 2.5f; + break; + case 2: + Weapons_ViewAnimation(EAGLE_IDLE3); + pl.w_idle_next = 1.633333f; + break; + default: + Weapons_ViewAnimation(EAGLE_IDLE4); + pl.w_idle_next = 2.5f; + } } void diff --git a/src/shared/gearbox/w_knife.c b/src/shared/gearbox/w_knife.c index 715e6662..f3520b51 100644 --- a/src/shared/gearbox/w_knife.c +++ b/src/shared/gearbox/w_knife.c @@ -107,7 +107,7 @@ w_knife_primary(void) pl.w_idle_next = 2.5f; #ifdef CSQC - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: anim = trace_fraction >= 1 ? KNIFE_ATTACK1MISS:KNIFE_ATTACK1HIT; @@ -126,7 +126,7 @@ w_knife_primary(void) Animation_PlayerTopTemp(ANIM_CR_SHOOTCROWBAR, 0.42f); } - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: sound(pl, CHAN_WEAPON, "weapons/knife1.wav", 1, ATTN_NORM); @@ -134,9 +134,8 @@ w_knife_primary(void) case 1: sound(pl, CHAN_WEAPON, "weapons/knife2.wav", 1, ATTN_NORM); break; - case 2: + default: sound(pl, CHAN_WEAPON, "weapons/knife3.wav", 1, ATTN_NORM); - break; } if (trace_fraction >= 1.0) { @@ -195,7 +194,6 @@ w_knife_release(void) default: Weapons_ViewAnimation(KNIFE_IDLE3); pl.w_idle_next = 5.3f; - break; } } diff --git a/src/shared/gearbox/w_penguin.c b/src/shared/gearbox/w_penguin.c index f404d545..61676c70 100644 --- a/src/shared/gearbox/w_penguin.c +++ b/src/shared/gearbox/w_penguin.c @@ -181,7 +181,7 @@ w_penguin_deploy(void) void w_penguin_primary(void) { - player pl = (player)self; + player pl = (player)self; if (pl.w_attack_next > 0.0) { return; } @@ -238,7 +238,7 @@ w_penguin_release(void) return; } - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: Weapons_ViewAnimation(PENGUIN_IDLE); diff --git a/src/shared/gearbox/w_pipewrench.c b/src/shared/gearbox/w_pipewrench.c index 12e8d548..4dd25f8d 100644 --- a/src/shared/gearbox/w_pipewrench.c +++ b/src/shared/gearbox/w_pipewrench.c @@ -115,7 +115,7 @@ w_pipewrench_primary(void) pl.w_idle_next = 2.5f; #ifdef CSQC - int r = floor(random(0,3)); + int r = (float)input_sequence % 3; switch (r) { case 0: anim = trace_fraction >= 1 ? PIPE_ATTACK1MISS:PIPE_ATTACK1HIT; diff --git a/src/shared/gearbox/w_sniperrifle.c b/src/shared/gearbox/w_sniperrifle.c index 8b8be3dd..a65a1bb0 100644 --- a/src/shared/gearbox/w_sniperrifle.c +++ b/src/shared/gearbox/w_sniperrifle.c @@ -200,7 +200,8 @@ w_sniperrifle_release(void) return; } - if (random() < 0.5) { + int r = (float)input_sequence % 2; + if (r == 1) { Weapons_ViewAnimation(SNIPER_IDLE1); } else { Weapons_ViewAnimation(SNIPER_IDLE2); diff --git a/src/shared/gearbox/w_sporelauncher.c b/src/shared/gearbox/w_sporelauncher.c index 83dcd762..44d2e99d 100644 --- a/src/shared/gearbox/w_sporelauncher.c +++ b/src/shared/gearbox/w_sporelauncher.c @@ -193,7 +193,7 @@ void w_sporelauncher_release(void) } if (pl.a_ammo3 == SLSTATE_IDLE) { - int r = floor(random(0,3)); + int r = (float)input_sequence % 3; switch (r) { case 0: Weapons_ViewAnimation(SPORE_IDLE1); diff --git a/src/shared/valve/w_crossbow.c b/src/shared/valve/w_crossbow.c index 55a61cde..ef4e868c 100644 --- a/src/shared/valve/w_crossbow.c +++ b/src/shared/valve/w_crossbow.c @@ -269,7 +269,8 @@ w_crossbow_release(void) } #ifdef CSQC - if (random() < 0.75) { + int r = (float)input_sequence % 2; + if (r == 1) { if (pl.a_ammo1) { Weapons_ViewAnimation(CROSSBOW_IDLE1); } else { diff --git a/src/shared/valve/w_crowbar.c b/src/shared/valve/w_crowbar.c index a8ff56a2..1bde641f 100644 --- a/src/shared/valve/w_crowbar.c +++ b/src/shared/valve/w_crowbar.c @@ -103,7 +103,7 @@ w_crowbar_primary(void) pl.w_idle_next = 2.5f; #ifdef CSQC - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: anim = trace_fraction >= 1 ? CBAR_ATTACK1MISS:CBAR_ATTACK1HIT; @@ -142,7 +142,7 @@ w_crowbar_primary(void) return; } - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: sound(pl, 8, "weapons/cbar_hitbod1.wav", 1, ATTN_NORM); @@ -150,12 +150,13 @@ w_crowbar_primary(void) case 1: sound(pl, 8, "weapons/cbar_hitbod2.wav", 1, ATTN_NORM); break; - case 2: + default: sound(pl, 8, "weapons/cbar_hitbod3.wav", 1, ATTN_NORM); break; } } else { - if (random() < 0.5) { + r = (float)input_sequence % 2; + if (r == 1) { sound(pl, 8, "weapons/cbar_hit1.wav", 1, ATTN_NORM); } else { sound(pl, 8, "weapons/cbar_hit2.wav", 1, ATTN_NORM); diff --git a/src/shared/valve/w_glock.c b/src/shared/valve/w_glock.c index b06b888c..438f8857 100644 --- a/src/shared/valve/w_glock.c +++ b/src/shared/valve/w_glock.c @@ -236,7 +236,7 @@ w_glock_release(void) return; } - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 1: Weapons_ViewAnimation(GLOCK_IDLE2); diff --git a/src/shared/valve/w_hornetgun.c b/src/shared/valve/w_hornetgun.c index 49833410..37539cf0 100644 --- a/src/shared/valve/w_hornetgun.c +++ b/src/shared/valve/w_hornetgun.c @@ -144,7 +144,7 @@ w_hornetgun_release(void) } int r; - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: Weapons_ViewAnimation(HORNETGUN_IDLE); diff --git a/src/shared/valve/w_mp5.c b/src/shared/valve/w_mp5.c index 54959ea5..f8ceb2db 100644 --- a/src/shared/valve/w_mp5.c +++ b/src/shared/valve/w_mp5.c @@ -252,7 +252,8 @@ w_mp5_release(void) return; } - if (random() < 0.5) { + int r = (float)input_sequence % 3; + if (r == 1) { Weapons_ViewAnimation(MP5_IDLE1); } else { Weapons_ViewAnimation(MP5_IDLE2); diff --git a/src/shared/valve/w_python.c b/src/shared/valve/w_python.c index 5063f1f8..2edcaf23 100644 --- a/src/shared/valve/w_python.c +++ b/src/shared/valve/w_python.c @@ -207,7 +207,7 @@ w_python_release(void) return; } - int r = floor(random(0, 4)); + int r = (float)input_sequence % 4; switch (r) { case 0: Weapons_ViewAnimation(PYTHON_IDLE1); diff --git a/src/shared/valve/w_snark.c b/src/shared/valve/w_snark.c index cd1f1ca5..2b3b608b 100644 --- a/src/shared/valve/w_snark.c +++ b/src/shared/valve/w_snark.c @@ -188,7 +188,7 @@ void w_snark_release(void) return; } - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: Weapons_ViewAnimation(SNARK_IDLE); diff --git a/src/shared/valve/w_tripmine.c b/src/shared/valve/w_tripmine.c index babe52d0..5563760a 100644 --- a/src/shared/valve/w_tripmine.c +++ b/src/shared/valve/w_tripmine.c @@ -237,7 +237,7 @@ void w_tripmine_release(void) return; } - r = floor(random(0,3)); + r = (float)input_sequence % 3; switch (r) { case 0: