Revert "network: code uglification; fixed bug with weapon switching (i hope)"

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

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 8a516bf35e0be35a7258ecac442aaca10ad3c48f..23f38ffd70a4916bbdde1d67bd417bf7d1d9ba3d 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -162,9 +162,6 @@ type
     FFlag:      Byte;
     FSecrets:   Integer;
     FCurrWeap:  Byte;
-    //FNetForceWeap: Byte; // spam server with this -- this is new weapon we want to use
-    FNetForceWeapFIdx: LongWord; // frame index; ignore weapon change if it is lesser than this
-    //FCurrFrameIdx: LongWord; // increased in each `Update()`
     FNextWeap:  WORD;
     FNextWeapDelay: Byte; // frames (unused)
     FBFGFireCounter: SmallInt;
@@ -361,9 +358,6 @@ type
     property    Death: Integer read FDeath write FDeath;
     property    Kills: Integer read FKills write FKills;
     property    CurrWeap: Byte read FCurrWeap write FCurrWeap;
-    //property    NetForceWeap: Byte read FNetForceWeap write FNetForceWeap;
-    property    NetForceWeapFIdx: LongWord read FNetForceWeapFIdx write FNetForceWeapFIdx;
-    //property    CurrFrameIdx: LongWord read FCurrFrameIdx write FCurrFrameIdx;
     property    MonsterKills: Integer read FMonsterKills write FMonsterKills;
     property    Secrets: Integer read FSecrets;
     property    GodMode: Boolean read FGodMode write FGodMode;
@@ -918,7 +912,6 @@ begin
   gPlayers[a].FSecrets := utils.readLongInt(st);
   // Òåêóùåå îðóæèå
   gPlayers[a].FCurrWeap := utils.readByte(st);
-  //gPlayers[a].FNetForceWeap := gPlayers[a].FCurrWeap;
   // Ñëåäóþùåå æåëàåìîå îðóæèå
   gPlayers[a].FNextWeap := utils.readWord(st);
   // ...è ïàóçà
@@ -1373,10 +1366,7 @@ begin
       if gPlayers[i] is TPlayer then
       begin
         gPlayers[i].Update();
-        if g_Game_IsClient or not g_Game_IsNet then
-        begin
-          gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
-        end;
+        gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
       end
       else
       begin
@@ -2148,10 +2138,6 @@ begin
   FJustTeleported := False;
   FNetTime := 0;
 
-  //FNetForceWeap := FCurrWeap;
-  FNetForceWeapFIdx := 0;
-  //FCurrFrameIdx := 0;
-
   resetWeaponQueue();
   releaseAllWeaponSwitchKeys();
 end;
@@ -3867,23 +3853,11 @@ begin
 
   if FWeapon[nw] then
   begin
-    //k8: emulate this on client immediately, or wait for server confirmation?
-    {
-    if g_Game_IsClient then
-    begin
-      FNetForceWeap := nw;
-      //FNetForceWeapFIdx := FCurrFrameIdx+5; // force for ~5 frames
-      FNetForceWeapFIdx := gTime+5; // force for ~5 frames
-      writeln('NETWEAPONSWITCH: fw=', NetForceWeap, '; fwfidx=', NetForceWeapFIdx, '; cfrm=', gTime);
-    end;
-    }
-    FNetForceWeapFIdx := gTime+5; // force for ~5 frames
     FCurrWeap := nw;
-    if nw = WEAPON_SAW then FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
-    FModel.SetWeapon(nw);
     FTime[T_SWITCH] := gTime+156;
+    if FCurrWeap = WEAPON_SAW then FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
+    FModel.SetWeapon(FCurrWeap);
     if g_Game_IsNet then MH_SEND_PlayerStats(FUID);
-    //if g_Game_IsNet and g_Game_IsClient then
   end;
 end;
 
@@ -3899,16 +3873,15 @@ begin
   FNextWeap := $4000;
 end;
 
-// used by network layer
 procedure TPlayer.SetWeapon(W: Byte);
 begin
   if FCurrWeap <> W then
-    if (W = WEAPON_SAW) then
+    if W = WEAPON_SAW then
       FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
 
   FCurrWeap := W;
   FModel.SetWeapon(CurrWeap);
-  //if g_Game_IsClient then resetWeaponQueue();
+  resetWeaponQueue();
 end;
 
 function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
@@ -4267,7 +4240,6 @@ begin
           if allowBerserkSwitching then
           begin
             FCurrWeap := WEAPON_KASTET;
-            //FNetForceWeap := FCurrWeap;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -4381,9 +4353,6 @@ begin
   FMonsterKills := 0;
   FDeath := 0;
   FSecrets := 0;
-  //FCurrFrameIdx := 0;
-  //FNetForceWeap := FCurrWeap;
-  //FNetForceWeapFIdx := 0;
   if FNoRespawn then
   begin
     FSpectator := False;
@@ -4575,7 +4544,6 @@ begin
   FShellTimer := -1;
   FPain := 0;
   FLastHit := 0;
-  //FNetForceWeap := FCurrWeap;
 
   if not g_Game_IsServer then
     Exit;
@@ -4639,7 +4607,6 @@ begin
     FWeapon[WEAPON_PISTOL] := True;
     FWeapon[WEAPON_KASTET] := True;
     FCurrWeap := WEAPON_PISTOL;
-    //FNetForceWeap := FCurrWeap;
     resetWeaponQueue();
 
     FModel.SetWeapon(FCurrWeap);
@@ -4719,8 +4686,6 @@ begin
   if (gPlayer2 = nil) and (gLMSPID2 = FUID) then
     gPlayer2 := self;
 
-  //FNetForceWeap := FCurrWeap;
-
   if g_Game_IsNet then
   begin
     MH_SEND_PlayerPos(True, FUID, NET_EVERYONE);
@@ -5013,8 +4978,6 @@ var
   AnyServer: Boolean;
   SetSpect: Boolean;
 begin
-  //Inc(FCurrFrameIdx);
-
   NetServer := g_Game_IsNet and g_Game_IsServer;
   AnyServer := g_Game_IsServer;
 
@@ -5945,7 +5908,6 @@ begin
   FAir := FSavedState.Air;
   FJetFuel := FSavedState.JetFuel;
   FCurrWeap := FSavedState.CurrWeap;
-  //FNetForceWeap := FCurrWeap;
   FNextWeap := FSavedState.NextWeap;
   FNextWeapDelay := FSavedState.NextWeapDelay;
 
@@ -6116,7 +6078,6 @@ begin
   FSecrets := utils.readLongInt(st);
   // Òåêóùåå îðóæèå
   FCurrWeap := utils.readByte(st);
-  //FNetForceWeap := FCurrWeap;
   // Æåëàåìîå îðóæèå
   FNextWeap := utils.readWord(st);
   // ...è ïàóçà
@@ -6252,7 +6213,6 @@ begin
           if FBFGFireCounter < 1 then
           begin
             FCurrWeap := WEAPON_KASTET;
-            //FNetForceWeap := FCurrWeap;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;