X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_player.pas;h=137ab818e6c4d7bbee6ec089ca7abb7c72c12dd5;hb=c1f5ac16c0ee5054cc0321f88e590a7a64cb3b71;hp=39aab01deb75a5bac5e5fc59dcbe16f5551e82c4;hpb=fc965d7cd1a1889f7407070f2bc19bc4ac48fd01;p=d2df-sdl.git

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 39aab01..137ab81 100644
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -201,7 +201,7 @@ type
     mEDamageType: Integer;
 
     // client-side only
-    weaponSwitchKeyReleased: array[0..16] of Byte; // bit 0: was released on prev frame; bit 1: new status
+    weaponSwitchKeyReleased: array[0..16] of Boolean; // true: was release
 
 
     function CollideLevel(XInc, YInc: Integer): Boolean;
@@ -313,6 +313,7 @@ type
     procedure   DrawPickup();
     procedure   DrawRulez();
     procedure   DrawAim();
+    procedure   DrawIndicator();
     procedure   DrawBubble();
     procedure   DrawGUI();
     procedure   Update(); virtual;
@@ -339,7 +340,6 @@ type
     procedure releaseAllWeaponSwitchKeys ();
     procedure weaponSwitchKeysStateChange (index: Integer; pressed: Boolean);
     function isWeaponSwitchKeyReleased (index: Integer): Boolean;
-    procedure weaponSwitchKeysShiftNewStates ();
 
   public
     property    Vel: TPoint2i read FObj.Vel;
@@ -550,6 +550,7 @@ var
   gFly: Boolean = False;
   gAimLine: Boolean = False;
   gChatBubble: Byte = 0;
+  gPlayerIndicator: Boolean = True;
   gNumBots: Word = 0;
   gLMSPID1: Word = 0;
   gLMSPID2: Word = 0;
@@ -2144,15 +2145,14 @@ procedure TPlayer.releaseAllWeaponSwitchKeys ();
 var
   f: Integer;
 begin
-  for f := 0 to High(weaponSwitchKeyReleased) do weaponSwitchKeyReleased[f] := $03;
+  for f := 0 to High(weaponSwitchKeyReleased) do weaponSwitchKeyReleased[f] := true;
 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] := weaponSwitchKeyReleased[index] or $02;
-  if (pressed) then weaponSwitchKeyReleased[index] := weaponSwitchKeyReleased[index] xor $02;
+  weaponSwitchKeyReleased[index] := not pressed;
 end;
 
 function TPlayer.isWeaponSwitchKeyReleased (index: Integer): Boolean;
@@ -2164,20 +2164,7 @@ begin
   end
   else
   begin
-    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);
+    result := weaponSwitchKeyReleased[index];
   end;
 end;
 
@@ -2325,6 +2312,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;
@@ -4230,6 +4236,7 @@ begin
           Result := True;
           remove := True;
           FFireTime := 0;
+          //k8:do we need it? if g_Game_IsNet and g_Game_IsServer then MH_SEND_PlayerStats(FUID);
         end;
         if FHealth < PLAYER_HP_SOFT then
         begin