Revert "network: changed weapon forcing logic; should be more reliable (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 0099b171830fbec8dfed9979c4d4d4e5eed092fb..9351a9d38b6937455c5f9d50233b4f0ca071cbc4 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -280,7 +280,7 @@ type
     procedure   ReleaseKeysNoWeapon();
     procedure   SetModel(ModelName: String);
     procedure   SetColor(Color: TRGB);
-    procedure   SetWeapon(W: Byte);
+    procedure   SetWeaponHost(W: Byte);
     function    IsKeyPressed(K: Byte): Boolean;
     function    GetKeys(): Byte;
     function    PickItem(ItemType: Byte; arespawn: Boolean; var remove: Boolean): Boolean; virtual;
@@ -317,6 +317,7 @@ type
     procedure   DrawPickup();
     procedure   DrawRulez();
     procedure   DrawAim();
+    procedure   DrawIndicator();
     procedure   DrawBubble();
     procedure   DrawGUI();
     procedure   Update(); virtual;
@@ -557,6 +558,7 @@ var
   gFly: Boolean = False;
   gAimLine: Boolean = False;
   gChatBubble: Byte = 0;
+  gPlayerIndicator: Boolean = True;
   gNumBots: Word = 0;
   gLMSPID1: Word = 0;
   gLMSPID2: Word = 0;
@@ -1370,12 +1372,10 @@ 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) then gPlayers[i].NetForceWeapFIdx := 0; // just in case
-        //if g_Game_IsClient or not g_Game_IsNet then
-        begin
-          gPlayers[i].RealizeCurrentWeapon(); // WARNING! DO NOT MOVE THIS INTO `Update()`!
-        end;
+        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
       begin
@@ -2341,6 +2341,25 @@ begin
   inherited;
 end;
 
+procedure TPlayer.DrawIndicator();
+var
+  indX, indY: Integer;
+  indW, indH: Word;
+  ID: DWORD;
+begin
+  if FAlive then
+    begin
+      indX := FObj.X+FObj.Rect.X;
+      indY := FObj.Y - 12;
+      if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then
+        begin
+          e_GetTextureSize(ID, @indW, @indH);
+          e_Draw(ID, indX + indW div 2, indY, 0, True, False);
+        end;
+    end;
+  //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead
+end;
+
 procedure TPlayer.DrawBubble();
 var
   bubX, bubY: Integer;
@@ -3708,6 +3727,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
@@ -3830,11 +3856,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
@@ -3879,9 +3908,12 @@ begin
   FNextWeap := $4000;
 end;
 
-// used by network layer
-procedure TPlayer.SetWeapon(W: Byte);
+// used exclusively by network layer
+procedure TPlayer.SetWeaponHost(W: Byte);
 begin
+  if (W > High(FWeapon)) then exit;
+  if (not FWeapon[W]) then exit; // server is authority!
+
   if FCurrWeap <> W then
     if (W = WEAPON_SAW) then
       FSawSoundSelect.PlayAt(FObj.X, FObj.Y);
@@ -4344,6 +4376,8 @@ begin
 end;
 
 procedure TPlayer.Reset(Force: Boolean);
+var
+  i: Integer;
 begin
   if Force then
     FAlive := False;
@@ -4364,6 +4398,7 @@ begin
   //FCurrFrameIdx := 0;
   //FNetForceWeap := FCurrWeap;
   FNetForceWeapFIdx := 0;
+  resetWeaponQueue();
   if FNoRespawn then
   begin
     FSpectator := False;
@@ -4374,10 +4409,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();
 
@@ -4390,6 +4431,11 @@ begin
   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);
@@ -4550,6 +4596,7 @@ var
   a, b, c: Byte;
   Anim: TAnimation;
   ID: DWORD;
+  i: Integer;
 begin
   FIncCam := 0;
   FBFGFireCounter := -1;
@@ -4558,6 +4605,11 @@ begin
   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;
@@ -4622,6 +4674,7 @@ begin
     FWeapon[WEAPON_KASTET] := True;
     FCurrWeap := WEAPON_PISTOL;
     //FNetForceWeap := FCurrWeap;
+    FNetForceWeapFIdx := 0;
     resetWeaponQueue();
 
     FModel.SetWeapon(FCurrWeap);
@@ -6235,6 +6288,7 @@ begin
           begin
             FCurrWeap := WEAPON_KASTET;
             //FNetForceWeap := FCurrWeap;
+            FNetForceWeapFIdx := 0;
             resetWeaponQueue();
             FModel.SetWeapon(WEAPON_KASTET);
           end;
@@ -6663,6 +6717,7 @@ begin
 
   FAIFlags := nil;
   FSelectedWeapon := FCurrWeap;
+  FNetForceWeapFIdx := 0;
   resetWeaponQueue();
   FTargetUID := 0;
 end;