From: DeaDDooMER Date: Fri, 4 Jan 2019 19:58:37 +0000 (+0300) Subject: Revert "reset weapon switch timer in various places; just in case" X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=c467a8913c6e2075633c2a5454e692cc94a4be0a;p=d2df-sdl.git Revert "reset weapon switch timer in various places; just in case" This reverts commit e80d004a8ce634dfaba32759d0c427503744a8da. --- diff --git a/src/game/g_player.pas b/src/game/g_player.pas index 7436e7a..5968cd1 100644 --- a/src/game/g_player.pas +++ b/src/game/g_player.pas @@ -1373,7 +1373,6 @@ begin if gPlayers[i] is TPlayer then begin gPlayers[i].Update(); - if (not gPlayers[i].alive) then gPlayers[i].NetForceWeapFIdx := 0; // just in case //if g_Game_IsClient or not g_Game_IsNet then begin gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`! @@ -4384,7 +4383,7 @@ begin FSecrets := 0; //FCurrFrameIdx := 0; //FNetForceWeap := FCurrWeap; - FNetForceWeapFIdx := 0; + //FNetForceWeapFIdx := 0; if FNoRespawn then begin FSpectator := False; @@ -4410,7 +4409,6 @@ begin FLastHit := 0; FLastFrag := 0; FComboEvnt := -1; - FNetForceWeapFIdx := 0; SetFlag(FLAG_NONE); SetAction(A_STAND, True); @@ -4578,7 +4576,6 @@ begin FPain := 0; FLastHit := 0; //FNetForceWeap := FCurrWeap; - FNetForceWeapFIdx := 0; if not g_Game_IsServer then Exit;