Merge pull request #1287 from newbytf/dev-cur

Dev cur
FortressOne · Jan 19, 2024 · 9a08069 · 9a08069
2 parents 8e70910 + 79f5d51
commit 9a08069
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/share/animate.qc b/share/animate.qc
@@ -46,11 +46,6 @@ void FO_SetClientThink(void() func, float offset, float override = TRUE) {
 }
 
 void client_anim_frames(void() parent_thunk, void() extra, anim_t* anim) {
-    if (self.deadflag) {
-        player_run();
-        return;
-    }
-
     float tidx = *thinkindex()++ - 1;
 
     int wfi = tidx % anim->num_wf;

diff --git a/share/weapons.qc b/share/weapons.qc
@@ -81,7 +81,7 @@ FO_WeapInfo weapon_info[] = {
     { WEAP_SPANNER,          PRED_MODEL, AMMO_CELLS,   0, 0,  0.5,  0 },
     { WEAP_AXE,              PRED_MODEL, AMMO_NONE,    0, 0,  0.5,  0 },
     { WEAP_SNIPER_RIFLE,     PRED_MODEL, AMMO_SHELLS, -9, 1,  1.5,  4 },
-    { WEAP_AUTO_RIFLE,       PRED_MODEL, AMMO_SHELLS,  0, 1,  0.1,  0, 1 },
+    { WEAP_AUTO_RIFLE,       PRED_MODEL, AMMO_SHELLS,  0, 1,  0.1,  0 },
     { WEAP_SHOTGUN,          PRED_MODEL, AMMO_SHELLS,  8, 1,  0.5,  2 },
     { WEAP_SUPER_SHOTGUN,    PRED_MODEL, AMMO_SHELLS, 16, 2,  0.7,  3 },
     { WEAP_NAILGUN,           PRED_PROJ, AMMO_NAILS,   0, 1,  0.2,  0, 1 },