X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=0565c75b2761056ab75ca321ac9c3d6c556cd480;hb=8a0bb6df836d0e815a261280d628cfd766fa02e7;hp=f9de6195596b43fa555a80dcbff9ba1d6c241388;hpb=85f0d06ec81bc2e66f235f87cf5c6844487b26c6;p=d2df-sdl.git

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index f9de619..0565c75 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -162,6 +162,9 @@ 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;
@@ -357,6 +360,9 @@ 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;
@@ -910,6 +916,7 @@ 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);
   // ...è ïàóçà
@@ -1363,7 +1370,9 @@ begin
     begin
       if gPlayers[i] is TPlayer then
       begin
+        //if (gPlayers[i].NetForceWeapFIdx > gTime) then writeln('*** PLAYER #', i, '; gTime=', gTime, '; nfwf=', gPlayers[i].NetForceWeapFIdx);
         gPlayers[i].Update();
+        if (not gPlayers[i].alive) or (gPlayers[i].NetForceWeapFIdx >= gTime+15) then gPlayers[i].NetForceWeapFIdx := 0; // just in case
         gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
       end
       else
@@ -2136,6 +2145,10 @@ begin
   FJustTeleported := False;
   FNetTime := 0;
 
+  //FNetForceWeap := FCurrWeap;
+  FNetForceWeapFIdx := 0;
+  //FCurrFrameIdx := 0;
+
   resetWeaponQueue();
   releaseAllWeaponSwitchKeys();
 end;
@@ -3693,6 +3706,13 @@ 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
@@ -3815,11 +3835,14 @@ 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;
   end;
 
+  if (FNetForceWeapFIdx >= gTime+15) then FNetForceWeapFIdx := 0;
+
   nw := getNextWeaponIndex();
   if nw = 255 then exit; // don't reset anything here
   if nw > High(FWeapon) then
@@ -3832,11 +3855,23 @@ 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;
 
@@ -3852,15 +3887,16 @@ 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);
-  resetWeaponQueue();
+  //if g_Game_IsClient then resetWeaponQueue();
 end;
 
 function TPlayer.PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean;
@@ -4219,6 +4255,7 @@ begin
           if allowBerserkSwitching then
           begin
             FCurrWeap := WEAPON_KASTET;
+            //FNetForceWeap := FCurrWeap;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -4315,6 +4352,8 @@ begin
 end;
 
 procedure TPlayer.Reset(Force: Boolean);
+var
+  i: Integer;
 begin
   if Force then
     FAlive := False;
@@ -4332,6 +4371,10 @@ begin
   FMonsterKills := 0;
   FDeath := 0;
   FSecrets := 0;
+  //FCurrFrameIdx := 0;
+  //FNetForceWeap := FCurrWeap;
+  FNetForceWeapFIdx := 0;
+  resetWeaponQueue();
   if FNoRespawn then
   begin
     FSpectator := False;
@@ -4342,10 +4385,16 @@ 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();
 
@@ -4357,6 +4406,12 @@ begin
   FLastHit := 0;
   FLastFrag := 0;
   FComboEvnt := -1;
+  FNetForceWeapFIdx := 0;
+  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);
@@ -4517,12 +4572,20 @@ var
   a, b, c: Byte;
   Anim: TAnimation;
   ID: DWORD;
+  i: Integer;
 begin
   FIncCam := 0;
   FBFGFireCounter := -1;
   FShellTimer := -1;
   FPain := 0;
   FLastHit := 0;
+  //FNetForceWeap := FCurrWeap;
+  FNetForceWeapFIdx := 0;
+  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;
@@ -4586,6 +4649,8 @@ begin
     FWeapon[WEAPON_PISTOL] := True;
     FWeapon[WEAPON_KASTET] := True;
     FCurrWeap := WEAPON_PISTOL;
+    //FNetForceWeap := FCurrWeap;
+    FNetForceWeapFIdx := 0;
     resetWeaponQueue();
 
     FModel.SetWeapon(FCurrWeap);
@@ -4665,6 +4730,8 @@ 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);
@@ -4957,6 +5024,8 @@ var
   AnyServer: Boolean;
   SetSpect: Boolean;
 begin
+  //Inc(FCurrFrameIdx);
+
   NetServer := g_Game_IsNet and g_Game_IsServer;
   AnyServer := g_Game_IsServer;
 
@@ -5887,6 +5956,7 @@ begin
   FAir := FSavedState.Air;
   FJetFuel := FSavedState.JetFuel;
   FCurrWeap := FSavedState.CurrWeap;
+  //FNetForceWeap := FCurrWeap;
   FNextWeap := FSavedState.NextWeap;
   FNextWeapDelay := FSavedState.NextWeapDelay;
 
@@ -6057,6 +6127,7 @@ begin
   FSecrets := utils.readLongInt(st);
   // Òåêóùåå îðóæèå
   FCurrWeap := utils.readByte(st);
+  //FNetForceWeap := FCurrWeap;
   // Æåëàåìîå îðóæèå
   FNextWeap := utils.readWord(st);
   // ...è ïàóçà
@@ -6192,6 +6263,8 @@ begin
           if FBFGFireCounter < 1 then
           begin
             FCurrWeap := WEAPON_KASTET;
+            //FNetForceWeap := FCurrWeap;
+            FNetForceWeapFIdx := 0;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -6620,6 +6693,7 @@ begin
 
   FAIFlags := nil;
   FSelectedWeapon := FCurrWeap;
+  FNetForceWeapFIdx := 0;
   resetWeaponQueue();
   FTargetUID := 0;
 end;