network: changed weapon forcing logic; should be more reliable (i hope)

[d2df-sdl.git] / src / game / g_netmsg.pas

diff --git a/src/game/g_netmsg.pas b/src/game/g_netmsg.pas
index 6d1f430e5509196b9212f1535b1baedf3658e8af..7cd1a7cc8ecd18dec4363db5ad4e55d1682206e8 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -16,6 +16,8 @@
 {$INCLUDE ../shared/a_modes.inc}
 unit g_netmsg;
 
+{.$DEFINE K8_XXX_WEAPON_DEBUG}
+
 interface
 
 uses e_msg, g_net, g_triggers, Classes, SysUtils, md5;
@@ -435,7 +437,8 @@ var
   PID: Word;
   kByte: Word;
   Pl: TPlayer;
-  GT: LongWord;
+  GT, wctr: LongWord;
+  newweapon: Byte;
 begin
   Result := 0;
   if not gGameOn then Exit;
@@ -453,8 +456,19 @@ begin
     NetTime := GT;
     kByte := M.ReadWord();
     Dir := M.ReadByte();
-    //WeaponSelect := M.ReadWord();
-    SetWeapon(M.ReadByte());
+    wctr := M.ReadLongWord();
+    newweapon := M.ReadByte();
+    if (wctr > Pl.NetWeapCtr) then
+    begin
+      if (newweapon <> CurrWeap) then
+      begin
+{$IFDEF K8_XXX_WEAPON_DEBUG}
+        writeln('HOST PLRPOS: got: currweap=', CurrWeap, '; curfrm=', gTime, '; netweap=', newweapon, '; oldweap=', CurrWeap);
+{$ENDIF}
+        SetWeaponHost(newweapon);
+      end;
+      Pl.NetWeapCtr := wctr;
+    end;
     //e_WriteLog(Format('R:ws=%d', [WeaponSelect]), MSG_WARNING);
     if Direction <> TDirection(Dir) then
       JustTeleported := False;
@@ -998,7 +1012,9 @@ begin
     NetOut.Write(FPing);
     NetOut.Write(FLoss);
     if IsKeyPressed(KEY_CHAT) then
-      kByte := NET_KEY_CHAT
+    begin
+      kByte := NET_KEY_CHAT;
+    end
     else
     begin
       if IsKeyPressed(KEY_LEFT) then kByte := kByte or NET_KEY_LEFT;
@@ -1011,6 +1027,10 @@ begin
 
     NetOut.Write(kByte);
     if Direction = TDirection.D_LEFT then NetOut.Write(Byte(0)) else NetOut.Write(Byte(1));
+
+    NetOut.Write(LongWord(Pl.NetWeapCtr));
+    NetOut.Write(Byte(Pl.CurrWeap));
+
     NetOut.Write(GameX);
     NetOut.Write(GameY);
     NetOut.Write(GameVelX);
@@ -1071,7 +1091,8 @@ begin
     NetOut.Write(Frags);
     NetOut.Write(Death);
 
-    NetOut.Write(CurrWeap);
+    NetOut.Write(LongWord(NetWeapCtr));
+    NetOut.Write(Byte(CurrWeap));
 
     // other flags
     ww := 0;
@@ -2015,11 +2036,11 @@ end;
 
 function MC_RECV_PlayerPos(var M: TMsg): Word;
 var
-  GT: LongWord;
+  GT, wctr: LongWord;
   PID: Word;
   kByte: Word;
   Pl: TPlayer;
-  Dir: Byte;
+  Dir, weapon: Byte;
   TmpX, TmpY: Integer;
 begin
   Result := 0;
@@ -2046,13 +2067,24 @@ begin
     kByte := M.ReadWord();
     Dir := M.ReadByte();
 
+    wctr := M.ReadLongWord();
+    weapon := M.ReadByte();
+    // `>=`, so server is still the authority
+    if (wctr >= Pl.NetWeapCtr) then
+    begin
+      Pl.CurrWeap := weapon;
+      Pl.NetWeapCtr := wctr;
+    end;
+
     TmpX := M.ReadLongInt();
     TmpY := M.ReadLongInt();
 
     ReleaseKeysNoWeapon;
 
     if (kByte = NET_KEY_CHAT) then
-      PressKey(KEY_CHAT, 10000)
+    begin
+      PressKey(KEY_CHAT, 10000);
+    end
     else
     begin
       if LongBool(kByte and NET_KEY_LEFT) then PressKey(KEY_LEFT, 10000);
@@ -2082,6 +2114,8 @@ var
   OldJet: Boolean;
   NewTeam: Byte;
   ww: Word;
+  newweapon: Byte;
+  wctr: LongWord;
 begin
   PID := M.ReadWord();
   Pl := g_Player_Get(PID);
@@ -2128,7 +2162,17 @@ begin
     Frags := M.ReadLongInt();
     Death := M.ReadLongInt();
 
-    SetWeapon(M.ReadByte());
+    wctr := M.ReadLongWord();
+    newweapon := M.ReadByte();
+{$IFDEF K8_XXX_WEAPON_DEBUG}
+    writeln('CLIENT PLRSTATS: got: currweap=', CurrWeap, '; curfrm=', gTime, '; netweap=', newweapon, '; lastnwfrm=', NetForceWeapFIdx);
+{$ENDIF}
+    // `>=`, so server is still the authority
+    if (wctr >= NetWeapCtr) then
+    begin
+      SetWeaponHost(newweapon);
+      NetWeapCtr := wctr;
+    end;
 
     // other flags
     ww := M.ReadByte();
@@ -2815,9 +2859,11 @@ begin
       begin
         if isKeyPressed(KeyWeapon[I], KeyWeapon2[I]) then
         begin
+          //writeln('keyweapon #', i, ' is pressed; released=', Integer(gPlayer1.isWeaponSwitchKeyReleased(i)), '; frm=', gPlayer1.NetForceWeapFIdx, '; gTime=', gTime);
           gPlayer1.weaponSwitchKeysStateChange(i, true);
           if gPlayer1.isWeaponSwitchKeyReleased(i) then
           begin
+            //writeln('keyweapon #', i, ' is pressed; released=', Integer(gPlayer1.isWeaponSwitchKeyReleased(i)), '; frm=', gPlayer1.NetForceWeapFIdx, '; gTime=', gTime);
             gPlayer1.QueueWeaponSwitch(i); // all choices are passed there, and god will take the best
             //WeaponSelect := WeaponSelect or Word(1 shl I);
           end;
@@ -2840,7 +2886,12 @@ begin
   NetOut.Write(gTime);
   NetOut.Write(kByte);
   NetOut.Write(Byte(gPlayer1.Direction));
+  NetOut.Write(LongWord(gPlayer1.NetWeapCtr));
   NetOut.Write(Byte(gPlayer1.CurrWeap));
+{$IFDEF K8_XXX_WEAPON_DEBUG}
+  if (kByte and NET_KEY_FIRE) <> 0 then writeln('FIRE: CurrWeap=', gPlayer1.CurrWeap);
+{$ENDIF}
+  //e_WriteLog(Format('S:nwp=%d; nwfidx=%d', [Integer(gPlayer1.NetForceWeap), Integer(gPlayer1.NetForceWeapFIdx)]), TMsgType.Warning);
   //NetOut.Write(WeaponSelect);
   //e_WriteLog(Format('S:ws=%d', [WeaponSelect]), MSG_WARNING);
   g_Net_Client_Send(True, NET_CHAN_PLAYERPOS);