added temporary hack for cyclic switching (remove it after readyweaon&pendinweapon...

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index 114c692242e50d3b5213bb7639579c7d324540ff..b3c00635e29cf462295f45fcda3138c89d2f9414 100644 (file)
--- 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 1bb60c2d53a4aa234445cb1e56a8090f677b1c35..0ea771329dbf0358acd332b70e85d8e4fe24e90c 100644 (file)
--- 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