X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=897ece3dfc10bb11996e6ebe4df8e0d36fa54819;hb=397f9cdedf0fb2a1a51d4f585db266b0f4925d97;hp=fa2dcfce5243696c55b09cc25aee27d9c44229f9;hpb=a9ab7bf0c72e15b932b20aad24b10db60138bb21;p=d2df-sdl.git

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index fa2dcfc..897ece3 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;
@@ -201,7 +204,7 @@ type
     mEDamageType: Integer;
 
     // client-side only
-    weaponSwitchKeyReleased: array[0..16] of Boolean; // true: was release
+    weaponSwitchKeyReleased: array[0..16] of Byte; // bit 0: was released on prev frame; bit 1: new status
 
 
     function CollideLevel(XInc, YInc: Integer): Boolean;
@@ -274,6 +277,7 @@ type
     function    GetRespawnPoint(): Byte;
     procedure   PressKey(Key: Byte; Time: Word = 1);
     procedure   ReleaseKeys();
+    procedure   ReleaseKeysNoWeapon();
     procedure   SetModel(ModelName: String);
     procedure   SetColor(Color: TRGB);
     procedure   SetWeapon(W: Byte);
@@ -339,6 +343,7 @@ type
     procedure releaseAllWeaponSwitchKeys ();
     procedure weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
     function isWeaponSwitchKeyReleased (index: Integer): Boolean;
+    procedure weaponSwitchKeysShiftNewStates ();
 
   public
     property    Vel: TPoint2i read FObj.Vel;
@@ -355,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;
@@ -908,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);
   // ...è ïàóçà
@@ -1362,7 +1371,10 @@ begin
       if gPlayers[i] is TPlayer then
       begin
         gPlayers[i].Update();
-        gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
+        if g_Game_IsClient or not g_Game_IsNet then
+        begin
+          gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
+        end;
       end
       else
       begin
@@ -2134,6 +2146,10 @@ begin
   FJustTeleported := False;
   FNetTime := 0;
 
+  //FNetForceWeap := FCurrWeap;
+  FNetForceWeapFIdx := 0;
+  //FCurrFrameIdx := 0;
+
   resetWeaponQueue();
   releaseAllWeaponSwitchKeys();
 end;
@@ -2143,14 +2159,15 @@ procedure TPlayer.releaseAllWeaponSwitchKeys ();
 var
   f: Integer;
 begin
-  for f := 0 to High(weaponSwitchKeyReleased) do weaponSwitchKeyReleased[f] := true;
+  for f := 0 to High(weaponSwitchKeyReleased) do weaponSwitchKeyReleased[f] := $03;
 end;
 
 procedure TPlayer.weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
 begin
   Inc(index, 2); // -2: prev; -1: next
   if (index < 0) or (index > High(weaponSwitchKeyReleased)) then exit;
-  weaponSwitchKeyReleased[index] := not pressed;
+  weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] or $02;
+  if (pressed) then weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] xor $02;
 end;
 
 function TPlayer.isWeaponSwitchKeyReleased (index: Integer): Boolean;
@@ -2162,7 +2179,20 @@ begin
   end
   else
   begin
-    result := weaponSwitchKeyReleased[index];
+    result := (weaponSwitchKeyReleased[index] and $01) <> 0;
+  end;
+end;
+
+procedure TPlayer.weaponSwitchKeysShiftNewStates ();
+var
+  f: Integer;
+begin
+  // copy bit 1 to bit 0
+  for f := 0 to High(weaponSwitchKeyReleased) do
+  begin
+    weaponSwitchKeyReleased[f] :=
+      (weaponSwitchKeyReleased[f] and $02) or
+      ((weaponSwitchKeyReleased[f] shr 1) and $01);
   end;
 end;
 
@@ -3574,7 +3604,7 @@ end;
 
 procedure TPlayer.QueueWeaponSwitch(Weapon: Byte);
 begin
-  if g_Game_IsClient then Exit;
+  //if g_Game_IsClient then Exit;
   if Weapon > High(FWeapon) then Exit;
   FNextWeap := FNextWeap or (1 shl Weapon);
 end;
@@ -3816,35 +3846,48 @@ 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;
 
 procedure TPlayer.NextWeapon();
 begin
-  if g_Game_IsClient then Exit;
+  //if g_Game_IsClient then Exit;
   FNextWeap := $8000;
 end;
 
 procedure TPlayer.PrevWeapon();
 begin
-  if g_Game_IsClient then Exit;
+  //if g_Game_IsClient then Exit;
   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;
@@ -4203,6 +4246,7 @@ begin
           if allowBerserkSwitching then
           begin
             FCurrWeap := WEAPON_KASTET;
+            //FNetForceWeap := FCurrWeap;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -4316,6 +4360,9 @@ begin
   FMonsterKills := 0;
   FDeath := 0;
   FSecrets := 0;
+  //FCurrFrameIdx := 0;
+  //FNetForceWeap := FCurrWeap;
+  //FNetForceWeapFIdx := 0;
   if FNoRespawn then
   begin
     FSpectator := False;
@@ -4507,6 +4554,7 @@ begin
   FShellTimer := -1;
   FPain := 0;
   FLastHit := 0;
+  //FNetForceWeap := FCurrWeap;
 
   if not g_Game_IsServer then
     Exit;
@@ -4570,6 +4618,7 @@ begin
     FWeapon[WEAPON_PISTOL] := True;
     FWeapon[WEAPON_KASTET] := True;
     FCurrWeap := WEAPON_PISTOL;
+    //FNetForceWeap := FCurrWeap;
     resetWeaponQueue();
 
     FModel.SetWeapon(FCurrWeap);
@@ -4649,6 +4698,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);
@@ -4941,6 +4992,8 @@ var
   AnyServer: Boolean;
   SetSpect: Boolean;
 begin
+  //Inc(FCurrFrameIdx);
+
   NetServer := g_Game_IsNet and g_Game_IsServer;
   AnyServer := g_Game_IsServer;
 
@@ -4951,6 +5004,7 @@ begin
       DoLerp(4);
 
   if NetServer then
+  begin
     if FClientID >= 0 then
     begin
       FPing := NetClients[FClientID].Peer^.lastRoundTripTime;
@@ -4963,6 +5017,7 @@ begin
       FPing := 0;
       FLoss := 0;
     end;
+  end;
 
   if FAlive and (FPunchAnim <> nil) then
     FPunchAnim.Update();
@@ -4993,8 +5048,8 @@ begin
   end;
 
   // no need to do that each second frame, weapon queue will take care of it
-  if FAlive and FKeys[KEY_NEXTWEAPON].Pressed and AnyServer then NextWeapon();
-  if FAlive and FKeys[KEY_PREVWEAPON].Pressed and AnyServer then PrevWeapon();
+  if FAlive and FKeys[KEY_NEXTWEAPON].Pressed {and AnyServer} then NextWeapon();
+  if FAlive and FKeys[KEY_PREVWEAPON].Pressed {and AnyServer} then PrevWeapon();
 
   if gTime mod (GAME_TICK*2) <> 0 then
   begin
@@ -5814,6 +5869,18 @@ begin
   end;
 end;
 
+procedure TPlayer.ReleaseKeysNoWeapon();
+var
+  a: Integer;
+begin
+  for a := Low(FKeys) to High(FKeys) do
+  begin
+    if (a = KEY_PREVWEAPON) or (a = KEY_NEXTWEAPON) then continue;
+    FKeys[a].Pressed := False;
+    FKeys[a].Time := 0;
+  end;
+end;
+
 procedure TPlayer.OnDamage(Angle: SmallInt);
 begin
 end;
@@ -5857,6 +5924,7 @@ begin
   FAir := FSavedState.Air;
   FJetFuel := FSavedState.JetFuel;
   FCurrWeap := FSavedState.CurrWeap;
+  //FNetForceWeap := FCurrWeap;
   FNextWeap := FSavedState.NextWeap;
   FNextWeapDelay := FSavedState.NextWeapDelay;
 
@@ -6027,6 +6095,7 @@ begin
   FSecrets := utils.readLongInt(st);
   // Òåêóùåå îðóæèå
   FCurrWeap := utils.readByte(st);
+  //FNetForceWeap := FCurrWeap;
   // Æåëàåìîå îðóæèå
   FNextWeap := utils.readWord(st);
   // ...è ïàóçà
@@ -6162,6 +6231,7 @@ begin
           if FBFGFireCounter < 1 then
           begin
             FCurrWeap := WEAPON_KASTET;
+            //FNetForceWeap := FCurrWeap;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -7020,7 +7090,7 @@ begin
             end;
         end;
 
-  //HACK! (does it belongs there?)
+  //HACK! (does it belong there?)
   RealizeCurrentWeapon();
 
 // Åñëè åñòü âîçìîæíûå öåëè: