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 6abe742c440bf746e51626c3a49bd428a604d799..23f38ffd70a4916bbdde1d67bd417bf7d1d9ba3d 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -162,7 +162,6 @@ type
     FFlag:      Byte;
     FSecrets:   Integer;
     FCurrWeap:  Byte;
-    FNetWeapCtr: LongWord; // spam server with our current weapon until we'll receive this in plrpos packet
     FNextWeap:  WORD;
     FNextWeapDelay: Byte; // frames (unused)
     FBFGFireCounter: SmallInt;
@@ -268,7 +267,6 @@ type
     viewPortX, viewPortY, viewPortW, viewPortH: Integer;
 
     function isValidViewPort (): Boolean; inline;
-    procedure SetCurrWeapProp (newweap: Byte);
 
     constructor Create(); virtual;
     destructor  Destroy(); override;
@@ -279,7 +277,7 @@ type
     procedure   ReleaseKeysNoWeapon();
     procedure   SetModel(ModelName: String);
     procedure   SetColor(Color: TRGB);
-    procedure   SetWeaponHost(W: Byte);
+    procedure   SetWeapon(W: Byte);
     function    IsKeyPressed(K: Byte): Boolean;
     function    GetKeys(): Byte;
     function    PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean; virtual;
@@ -359,8 +357,7 @@ type
     property    Frags: Integer read FFrags write FFrags;
     property    Death: Integer read FDeath write FDeath;
     property    Kills: Integer read FKills write FKills;
-    property    CurrWeap: Byte read FCurrWeap write SetCurrWeapProp;
-    property    NetWeapCtr: LongWord read FNetWeapCtr write FNetWeapCtr;
+    property    CurrWeap: Byte read FCurrWeap write FCurrWeap;
     property    MonsterKills: Integer read FMonsterKills write FMonsterKills;
     property    Secrets: Integer read FSecrets;
     property    GodMode: Boolean read FGodMode write FGodMode;
@@ -391,7 +388,7 @@ type
     property eFrags: Integer read FFrags write FFrags;
     property eDeath: Integer read FDeath write FDeath;
     property eKills: Integer read FKills write FKills;
-    property eCurrWeap: Byte read FCurrWeap write SetCurrWeapProp;
+    property eCurrWeap: Byte read FCurrWeap write FCurrWeap;
     property eMonsterKills: Integer read FMonsterKills write FMonsterKills;
     property eSecrets: Integer read FSecrets write FSecrets;
     property eGodMode: Boolean read FGodMode write FGodMode;
@@ -915,7 +912,6 @@ begin
   gPlayers[a].FSecrets := utils.readLongInt(st);
   // Òåêóùåå îðóæèå
   gPlayers[a].FCurrWeap := utils.readByte(st);
-  gPlayers[a].FNetWeapCtr := 0;
   // Ñëåäóþùåå æåëàåìîå îðóæèå
   gPlayers[a].FNextWeap := utils.readWord(st);
   // ...è ïàóçà
@@ -1954,19 +1950,6 @@ end;
 
 function TPlayer.isValidViewPort (): Boolean; inline; begin result := (viewPortW > 0) and (viewPortH > 0); end;
 
-procedure TPlayer.SetCurrWeapProp (newweap: Byte);
-begin
-  if (newweap > High(FWeapon)) then exit;
-  if (not FWeapon[newweap]) then exit;
-  if not g_Game_IsClient then Inc(FNetWeapCtr, 2); // just in case, to really override client's counter
-  if (FCurrWeap <> newweap) then
-  begin
-    if (newweap = WEAPON_SAW) then FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
-  end;
-  FCurrWeap := newweap;
-  FModel.SetWeapon(newweap);
-end;
-
 procedure TPlayer.BFGHit();
 begin
   g_Weapon_BFGHit(FObj.X+FObj.Rect.X+(FObj.Rect.Width div 2),
@@ -2155,8 +2138,6 @@ begin
   FJustTeleported := False;
   FNetTime := 0;
 
-  FNetWeapCtr := 0;
-
   resetWeaponQueue();
   releaseAllWeaponSwitchKeys();
 end;
@@ -3733,13 +3714,6 @@ begin
   WEAPON_FLAMETHROWER   = 10;
   *)
 
-  {
-  if (FNextWeap <> 0) or (FNextWeapDelay <> 0) then
-  begin
-    e_WriteLog(Format('!!! FNextWeap=%04x; FNextWeapDelay=%d', [FNextWeap, FNextWeapDelay]), TMsgType.Warning);
-  end;
-  }
-
   // cycling has priority
   if (FNextWeap and $C000) <> 0 then
   begin
@@ -3862,7 +3836,6 @@ begin
 
   if not switchAllowed then
   begin
-    //writeln('WEAPON SWITCHING IS NOT ALLOWED! FBFGFireCounter=', FBFGFireCounter, '; gTime=', gTime, '; FTime[T_SWITCH]=', FTime[T_SWITCH]);
     //HACK for weapon cycling
     if (FNextWeap and $E000) <> 0 then FNextWeap := 0;
     exit;
@@ -3880,12 +3853,10 @@ begin
 
   if FWeapon[nw] then
   begin
-    //k8: emulate this on client immediately, or wait for server confirmation?
-    Inc(FNetWeapCtr);
     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);
   end;
 end;
@@ -3902,20 +3873,15 @@ begin
   FNextWeap := $4000;
 end;
 
-// used exclusively by network layer
-procedure TPlayer.SetWeaponHost(W: Byte);
+procedure TPlayer.SetWeapon(W: Byte);
 begin
-  if (W > High(FWeapon)) then exit;
-  if (not FWeapon[W]) then exit; // server is authority!
-
   if FCurrWeap <> W then
-  begin
-    if (W = WEAPON_SAW) then FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
-  end;
+    if W = WEAPON_SAW then
+      FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
 
   FCurrWeap := W;
-  FModel.SetWeapon(W);
-  //if g_Game_IsClient then resetWeaponQueue();
+  FModel.SetWeapon(CurrWeap);
+  resetWeaponQueue();
 end;
 
 function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
@@ -4273,7 +4239,7 @@ begin
           Include(FRulez, R_BERSERK);
           if allowBerserkSwitching then
           begin
-            CurrWeap := WEAPON_KASTET;
+            FCurrWeap := WEAPON_KASTET;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -4370,8 +4336,6 @@ begin
 end;
 
 procedure TPlayer.Reset(Force: Boolean);
-var
-  i: Integer;
 begin
   if Force then
     FAlive := False;
@@ -4389,8 +4353,6 @@ begin
   FMonsterKills := 0;
   FDeath := 0;
   FSecrets := 0;
-  if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2);
-  resetWeaponQueue();
   if FNoRespawn then
   begin
     FSpectator := False;
@@ -4401,16 +4363,10 @@ begin
   end;
   FLives := gGameSettings.MaxLives;
 
-  FBFGFireCounter := -1;
-  FTime[T_SWITCH] := 0;
-  for i := WP_FIRST to WP_LAST do FReloading[i] := 0;
-
   SetFlag(FLAG_NONE);
 end;
 
 procedure TPlayer.SoftReset();
-var
-  i: Integer;
 begin
   ReleaseKeys();
 
@@ -4422,12 +4378,6 @@ begin
   FLastHit := 0;
   FLastFrag := 0;
   FComboEvnt := -1;
-  if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2);
-  resetWeaponQueue();
-
-  FBFGFireCounter := -1;
-  FTime[T_SWITCH] := 0;
-  for i := WP_FIRST to WP_LAST do FReloading[i] := 0;
 
   SetFlag(FLAG_NONE);
   SetAction(A_STAND, True);
@@ -4588,19 +4538,12 @@ var
   a, b, c: Byte;
   Anim: TAnimation;
   ID: DWORD;
-  i: Integer;
 begin
   FIncCam := 0;
   FBFGFireCounter := -1;
   FShellTimer := -1;
   FPain := 0;
   FLastHit := 0;
-  if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2);
-  resetWeaponQueue();
-
-  FBFGFireCounter := -1;
-  FTime[T_SWITCH] := 0;
-  for i := WP_FIRST to WP_LAST do FReloading[i] := 0;
 
   if not g_Game_IsServer then
     Exit;
@@ -4663,10 +4606,11 @@ begin
 
     FWeapon[WEAPON_PISTOL] := True;
     FWeapon[WEAPON_KASTET] := True;
-    CurrWeap := WEAPON_PISTOL;
-    if g_Game_IsClient then FNetWeapCtr := 0 else Inc(FNetWeapCtr, 2);
+    FCurrWeap := WEAPON_PISTOL;
     resetWeaponQueue();
 
+    FModel.SetWeapon(FCurrWeap);
+
     for b := A_BULLETS to A_HIGH do
       FAmmo[b] := 0;
 
@@ -5964,7 +5908,6 @@ begin
   FAir := FSavedState.Air;
   FJetFuel := FSavedState.JetFuel;
   FCurrWeap := FSavedState.CurrWeap;
-  FModel.SetWeapon(FCurrWeap);
   FNextWeap := FSavedState.NextWeap;
   FNextWeapDelay := FSavedState.NextWeapDelay;
 
@@ -6135,7 +6078,6 @@ begin
   FSecrets := utils.readLongInt(st);
   // Òåêóùåå îðóæèå
   FCurrWeap := utils.readByte(st);
-  if not g_Game_IsClient then Inc(FNetWeapCtr, 2);
   // Æåëàåìîå îðóæèå
   FNextWeap := utils.readWord(st);
   // ...è ïàóçà
@@ -6270,7 +6212,7 @@ begin
           Include(FRulez, R_BERSERK);
           if FBFGFireCounter < 1 then
           begin
-            CurrWeap := WEAPON_KASTET;
+            FCurrWeap := WEAPON_KASTET;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -6699,7 +6641,6 @@ begin
 
   FAIFlags := nil;
   FSelectedWeapon := FCurrWeap;
-  FNetWeapCtr := 0;
   resetWeaponQueue();
   FTargetUID := 0;
 end;