Revert "network: code uglification; fixed bug with weapon switching (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 7cd1a7cc8ecd18dec4363db5ad4e55d1682206e8..6d1f430e5509196b9212f1535b1baedf3658e8af 100644 (file)
--- a/src/game/g_netmsg.pas
+++ b/src/game/g_netmsg.pas
@@ -16,8 +16,6 @@
 {$INCLUDE ../shared/a_modes.inc}
 unit g_netmsg;
 
-{.$DEFINE K8_XXX_WEAPON_DEBUG}
-
 interface
 
 uses e_msg, g_net, g_triggers, Classes, SysUtils, md5;
@@ -437,8 +435,7 @@ var
   PID: Word;
   kByte: Word;
   Pl: TPlayer;
-  GT, wctr: LongWord;
-  newweapon: Byte;
+  GT: LongWord;
 begin
   Result := 0;
   if not gGameOn then Exit;
@@ -456,19 +453,8 @@ begin
     NetTime := GT;
     kByte := M.ReadWord();
     Dir := 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;
+    //WeaponSelect := M.ReadWord();
+    SetWeapon(M.ReadByte());
     //e_WriteLog(Format('R:ws=%d', [WeaponSelect]), MSG_WARNING);
     if Direction <> TDirection(Dir) then
       JustTeleported := False;
@@ -1012,9 +998,7 @@ begin
     NetOut.Write(FPing);
     NetOut.Write(FLoss);
     if IsKeyPressed(KEY_CHAT) then
-    begin
-      kByte := NET_KEY_CHAT;
-    end
+      kByte := NET_KEY_CHAT
     else
     begin
       if IsKeyPressed(KEY_LEFT) then kByte := kByte or NET_KEY_LEFT;
@@ -1027,10 +1011,6 @@ 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);
@@ -1091,8 +1071,7 @@ begin
     NetOut.Write(Frags);
     NetOut.Write(Death);
 
-    NetOut.Write(LongWord(NetWeapCtr));
-    NetOut.Write(Byte(CurrWeap));
+    NetOut.Write(CurrWeap);
 
     // other flags
     ww := 0;
@@ -2036,11 +2015,11 @@ end;
 
 function MC_RECV_PlayerPos(var M: TMsg): Word;
 var
-  GT, wctr: LongWord;
+  GT: LongWord;
   PID: Word;
   kByte: Word;
   Pl: TPlayer;
-  Dir, weapon: Byte;
+  Dir: Byte;
   TmpX, TmpY: Integer;
 begin
   Result := 0;
@@ -2067,24 +2046,13 @@ 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
-    begin
-      PressKey(KEY_CHAT, 10000);
-    end
+      PressKey(KEY_CHAT, 10000)
     else
     begin
       if LongBool(kByte and NET_KEY_LEFT) then PressKey(KEY_LEFT, 10000);
@@ -2114,8 +2082,6 @@ var
   OldJet: Boolean;
   NewTeam: Byte;
   ww: Word;
-  newweapon: Byte;
-  wctr: LongWord;
 begin
   PID := M.ReadWord();
   Pl := g_Player_Get(PID);
@@ -2162,17 +2128,7 @@ begin
     Frags := M.ReadLongInt();
     Death := M.ReadLongInt();
 
-    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;
+    SetWeapon(M.ReadByte());
 
     // other flags
     ww := M.ReadByte();
@@ -2859,11 +2815,9 @@ 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;
@@ -2886,12 +2840,7 @@ 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);