From fb11cb5f8f6664c256bf5a149b1e92f78e1252b5 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Wed, 15 Sep 2021 22:59:53 +0200 Subject: [PATCH] Remove the timer hacks I did when I was figuring out the timing problem --- src/shared/w_crossbow.qc | 2 +- src/shared/w_egon.qc | 1 - src/shared/w_gauss.qc | 1 - src/shared/w_handgrenade.qc | 1 - src/shared/w_hornetgun.qc | 1 - src/shared/w_python.qc | 1 - src/shared/w_rpg.qc | 2 -- src/shared/w_shotgun.qc | 1 - src/shared/w_snark.qc | 2 -- src/shared/w_tripmine.qc | 1 - 10 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/shared/w_crossbow.qc b/src/shared/w_crossbow.qc index b2ec0d1..53f7297 100644 --- a/src/shared/w_crossbow.qc +++ b/src/shared/w_crossbow.qc @@ -290,7 +290,7 @@ w_crossbow_release(void) } } - pl.w_idle_next = 3.0f * 2.5f; + pl.w_idle_next = 3.0f; } void diff --git a/src/shared/w_egon.qc b/src/shared/w_egon.qc index 87527f4..b4b4078 100644 --- a/src/shared/w_egon.qc +++ b/src/shared/w_egon.qc @@ -199,7 +199,6 @@ void w_egon_release(void) pl.w_idle_next = 2.0f; } pl.mode_tempstate = 0; - pl.w_idle_next *= 2.5f; } } diff --git a/src/shared/w_gauss.qc b/src/shared/w_gauss.qc index 2925f8a..e964d6f 100644 --- a/src/shared/w_gauss.qc +++ b/src/shared/w_gauss.qc @@ -279,7 +279,6 @@ void w_gauss_release(void) pl.w_idle_next = 4.0f; break; } - pl.w_idle_next *= 2.5f; } void w_gauss_crosshair(void) diff --git a/src/shared/w_handgrenade.qc b/src/shared/w_handgrenade.qc index f5fde06..35175d1 100644 --- a/src/shared/w_handgrenade.qc +++ b/src/shared/w_handgrenade.qc @@ -218,7 +218,6 @@ void w_handgrenade_release(void) Weapons_ViewAnimation(HANDGRENADE_IDLE); pl.w_idle_next = 3.0f; } - pl.w_idle_next *= 2.5f; } } diff --git a/src/shared/w_hornetgun.qc b/src/shared/w_hornetgun.qc index 0c5d085..17096d3 100644 --- a/src/shared/w_hornetgun.qc +++ b/src/shared/w_hornetgun.qc @@ -161,7 +161,6 @@ w_hornetgun_release(void) Weapons_ViewAnimation(HORNETGUN_IDLE); pl.w_idle_next = 1.875f; } - pl.w_idle_next *= 2.5f; } void diff --git a/src/shared/w_python.qc b/src/shared/w_python.qc index 0d22bc9..68caf7a 100644 --- a/src/shared/w_python.qc +++ b/src/shared/w_python.qc @@ -254,7 +254,6 @@ w_python_release(void) pl.w_idle_next = 2.93f; break; } - pl.w_idle_next *= 2.5f; } void diff --git a/src/shared/w_rpg.qc b/src/shared/w_rpg.qc index 6c7d143..ffba713 100644 --- a/src/shared/w_rpg.qc +++ b/src/shared/w_rpg.qc @@ -232,8 +232,6 @@ void w_rpg_release(void) Weapons_ViewAnimation(RPG_IDLE_UL); } } - - pl.w_idle_next = 3.0f * 2.5f; } void w_rpg_secondary(void) diff --git a/src/shared/w_shotgun.qc b/src/shared/w_shotgun.qc index e7b3ff1..fd98d56 100644 --- a/src/shared/w_shotgun.qc +++ b/src/shared/w_shotgun.qc @@ -317,7 +317,6 @@ w_shotgun_release(void) pl.w_idle_next = 2.222222f; break; } - pl.w_idle_next *= 2.5f; } else if (pl.mode_tempstate == SHOTTY_RELOAD_START) { Weapons_ViewAnimation(SHOTGUN_START_RELOAD); pl.mode_tempstate = SHOTTY_RELOAD; diff --git a/src/shared/w_snark.qc b/src/shared/w_snark.qc index 2b94917..006a050 100644 --- a/src/shared/w_snark.qc +++ b/src/shared/w_snark.qc @@ -247,8 +247,6 @@ void w_snark_release(void) pl.w_idle_next = 5.0f; break; } - - pl.w_idle_next *= 2.5f; } void w_snark_precache(void) diff --git a/src/shared/w_tripmine.qc b/src/shared/w_tripmine.qc index cf3f586..e23ff09 100644 --- a/src/shared/w_tripmine.qc +++ b/src/shared/w_tripmine.qc @@ -339,7 +339,6 @@ w_tripmine_release(void) pl.w_idle_next = 3.34f; break; } - pl.w_idle_next *= 2.5f; } float