From b7c26c7f1787937245991190591ef4a6ee4d152e Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Wed, 10 Apr 2019 19:16:29 +0300 Subject: [PATCH] added temporary hack for cyclic switching (remove it after readyweaon&pendinweapon implementation!) --- src/game/g_game.pas | 3 +++ src/game/g_netmsg.pas | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/game/g_game.pas b/src/game/g_game.pas index 114c692..b3c0063 100644 --- a/src/game/g_game.pas +++ b/src/game/g_game.pas @@ -1562,6 +1562,9 @@ begin if gPlayerAction[p, ACTION_WEAPPREV] then plr.PressKey(KEY_PREVWEAPON); if gPlayerAction[p, ACTION_ACTIVATE] then plr.PressKey(KEY_OPEN); + gPlayerAction[p, ACTION_WEAPNEXT] := False; // HACK, remove after readyweaon&pendinweapon implementation + gPlayerAction[p, ACTION_WEAPPREV] := False; // HACK, remove after readyweaon&pendinweapon implementation + for i := WP_FIRST to WP_LAST do begin if gSelectWeapon[p, i] then diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas index 1bb60c2..0ea7713 100644 --- a/src/game/g_netmsg.pas +++ b/src/game/g_netmsg.pas @@ -2858,6 +2858,9 @@ begin if gPlayerAction[0, ACTION_WEAPNEXT] then kByte := kByte or NET_KEY_NW; if gPlayerAction[0, ACTION_WEAPPREV] then kByte := kByte or NET_KEY_PW; + gPlayerAction[0, ACTION_WEAPNEXT] := False; // HACK, remove after readyweaon&pendinweapon implementation + gPlayerAction[0, ACTION_WEAPPREV] := False; // HACK, remove after readyweaon&pendinweapon implementation + for i := WP_FIRST to WP_LAST do begin if gSelectWeapon[0, i] then -- 2.29.2