diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h index 3932be1fb1..081ddddc29 100644 --- a/source/games/exhumed/src/aistuff.h +++ b/source/games/exhumed/src/aistuff.h @@ -138,8 +138,6 @@ void SetNewWeapon(int nPlayer, int nWeapon); void SetNewWeaponImmediate(int nPlayer, int nWeapon); void SetNewWeaponIfBetter(int nPlayer, int nWeapon); void SelectNewWeapon(int nPlayer); -void StopFiringWeapon(int nPlayer); -void FireWeapon(int nPlayer); void CheckClip(int nPlayer); void MoveWeapons(int nPlayer); void DrawWeapons(double interpfrac); diff --git a/source/games/exhumed/src/gun.cpp b/source/games/exhumed/src/gun.cpp index c51c82251a..2a38c40df7 100644 --- a/source/games/exhumed/src/gun.cpp +++ b/source/games/exhumed/src/gun.cpp @@ -248,18 +248,6 @@ void SelectNewWeapon(int nPlayer) // //--------------------------------------------------------------------------- -void StopFiringWeapon(int nPlayer) -{ - PlayerList[nPlayer].bIsFiring = false; -} - -void FireWeapon(int nPlayer) -{ - if (!PlayerList[nPlayer].bIsFiring) { - PlayerList[nPlayer].bIsFiring = true; - } -} - void SetWeaponStatus(int nPlayer) { } diff --git a/source/games/exhumed/src/player.cpp b/source/games/exhumed/src/player.cpp index 110ab5201a..d9123b0931 100644 --- a/source/games/exhumed/src/player.cpp +++ b/source/games/exhumed/src/player.cpp @@ -444,7 +444,7 @@ void StartDeathSeq(int nPlayer, int nVal) } } - StopFiringWeapon(nPlayer); + PlayerList[nPlayer].bIsFiring = false; PlayerList[nPlayer].pActor->PrevAngles.Pitch = PlayerList[nPlayer].pActor->spr.Angles.Pitch = nullAngle; pActor->oviewzoffset = pActor->viewzoffset = -55; @@ -1520,15 +1520,7 @@ void AIPlayer::Tick(RunListEvent* ev) } } - // was int var_38 = buttons & 0x8 - if (pPlayer->input.actions & SB_FIRE) - { - FireWeapon(pPlayer->nPlayer); - } - else - { - StopFiringWeapon(pPlayer->nPlayer); - } + pPlayer->bIsFiring = !!(pPlayer->input.actions & SB_FIRE); } updatePlayerAction(pPlayer);