Changed indicator's vertical offset:

[d2df-sdl.git] / src / game / g_player.pas

diff --git a/src/game/g_player.pas b/src/game/g_player.pas
index 736d22e1623ce2d1291825a49386cc63a75963c9..ef00f5d3796e5fc18c9e185d5e574bfb4d25d32a 100644 (file)
--- a/src/game/g_player.pas
+++ b/src/game/g_player.pas
@@ -231,6 +231,8 @@ type
 
     procedure doDamage (v: Integer);
 
 
     procedure doDamage (v: Integer);
 

+    function followCorpse(): Boolean;
+

   public
     FDamageBuffer:   Integer;
 
   public
     FDamageBuffer:   Integer;
 


@@ -308,6 +310,7 @@ type
     procedure   DrawPickup();
     procedure   DrawRulez();
     procedure   DrawAim();
     procedure   DrawPickup();
     procedure   DrawRulez();
     procedure   DrawAim();

+    procedure   DrawIndicator();

     procedure   DrawBubble();
     procedure   DrawGUI();
     procedure   Update(); virtual;
     procedure   DrawBubble();
     procedure   DrawGUI();
     procedure   Update(); virtual;


@@ -463,7 +466,7 @@ type
 
   PGib = ^TGib;
   TGib = record
 
   PGib = ^TGib;
   TGib = record

-    alive:     Boolean;
+    alive:    Boolean;

     ID:       DWORD;
     MaskID:   DWORD;
     RAngle:   Integer;
     ID:       DWORD;
     MaskID:   DWORD;
     RAngle:   Integer;


@@ -501,6 +504,7 @@ type
     FDamage:        Byte;
     FColor:         TRGB;
     FObj:           TObj;
     FDamage:        Byte;
     FColor:         TRGB;
     FObj:           TObj;

+    FPlayerUID:     Word;

     FAnimation:     TAnimation;
     FAnimationMask: TAnimation;
 
     FAnimation:     TAnimation;
     FAnimationMask: TAnimation;
 


@@ -539,6 +543,7 @@ var
   gFly: Boolean = False;
   gAimLine: Boolean = False;
   gChatBubble: Byte = 0;
   gFly: Boolean = False;
   gAimLine: Boolean = False;
   gChatBubble: Byte = 0;

+  gPlayerIndicator: Boolean = True;

   gNumBots: Word = 0;
   gLMSPID1: Word = 0;
   gLMSPID2: Word = 0;
   gNumBots: Word = 0;
   gLMSPID1: Word = 0;
   gLMSPID2: Word = 0;


@@ -1509,11 +1514,20 @@ end;
 
 procedure g_Player_CreateCorpse(Player: TPlayer);
 var
 
 procedure g_Player_CreateCorpse(Player: TPlayer);
 var

+  i: Integer;

   find_id: DWORD;
   ok: Boolean;
 begin
   if Player.alive then
     Exit;
   find_id: DWORD;
   ok: Boolean;
 begin
   if Player.alive then
     Exit;

+
+// Ðàçðûâàåì ñâÿçü ñ ïðåæíèì òðóïîì:
+  if gCorpses <> nil then
+    for i := 0 to High(gCorpses) do
+      if gCorpses[i] <> nil then
+        if gCorpses[i].FPlayerUID = Player.FUID then
+          gCorpses[i].FPlayerUID := 0;
+

   if Player.FObj.Y >= gMapInfo.Height+128 then
     Exit;
 
   if Player.FObj.Y >= gMapInfo.Height+128 then
     Exit;
 


@@ -1539,6 +1553,7 @@ begin
         gCorpses[find_id].FColor := FModel.Color;
         gCorpses[find_id].FObj.Vel := FObj.Vel;
         gCorpses[find_id].FObj.Accel := FObj.Accel;
         gCorpses[find_id].FColor := FModel.Color;
         gCorpses[find_id].FObj.Vel := FObj.Vel;
         gCorpses[find_id].FObj.Accel := FObj.Accel;

+        gCorpses[find_id].FPlayerUID := FUID;

       end
     else
       g_Player_CreateGibs(FObj.X + PLAYER_RECT_CX,
       end
     else
       g_Player_CreateGibs(FObj.X + PLAYER_RECT_CX,


@@ -1598,11 +1613,13 @@ procedure g_Player_CreateGibs(fX, fY: Integer; ModelName: string; fColor: TRGB);
 var
   a: Integer;
   GibsArray: TGibsArray;
 var
   a: Integer;
   GibsArray: TGibsArray;

+  Blood: TModelBlood;

 begin
   if (gGibs = nil) or (Length(gGibs) = 0) then
     Exit;
   if not g_PlayerModel_GetGibs(ModelName, GibsArray) then
     Exit;
 begin
   if (gGibs = nil) or (Length(gGibs) = 0) then
     Exit;
   if not g_PlayerModel_GetGibs(ModelName, GibsArray) then
     Exit;

+  Blood := g_PlayerModel_GetBlood(ModelName);

 
   for a := 0 to High(GibsArray) do
     with gGibs[CurrentGib] do
 
   for a := 0 to High(GibsArray) do
     with gGibs[CurrentGib] do


@@ -1621,7 +1638,7 @@ begin
 
       if gBloodCount > 0 then
         g_GFX_Blood(fX, fY, 16*gBloodCount+Random(5*gBloodCount), -16+Random(33), -16+Random(33),
 
       if gBloodCount > 0 then
         g_GFX_Blood(fX, fY, 16*gBloodCount+Random(5*gBloodCount), -16+Random(33), -16+Random(33),

-                    Random(48), Random(48), 150, 0, 0);
+                    Random(48), Random(48), Blood.R, Blood.G, Blood.B, Blood.Kind);

 
       if CurrentGib >= High(gGibs) then
         CurrentGib := 0
 
       if CurrentGib >= High(gGibs) then
         CurrentGib := 0


@@ -2258,6 +2275,25 @@ begin
   inherited;
 end;
 
   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;
+      if g_Texture_Get('TEXTURE_PLAYER_INDICATOR', ID) then
+        begin
+          e_GetTextureSize(ID, @indW, @indH);
+          e_Draw(ID, indX + indW div 2, indY - indH, 0, True, False);
+        end;
+    end;
+  //e_TextureFontPrint(indX, indY, FName, gStdFont); // Shows player name overhead
+end;
+

 procedure TPlayer.DrawBubble();
 var
   bubX, bubY: Integer;
 procedure TPlayer.DrawBubble();
 var
   bubX, bubY: Integer;


@@ -3505,11 +3541,11 @@ begin
   g_GFX_Blood(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2)+8,
               FObj.Y+PLAYER_RECT.Y+(PLAYER_RECT.Height div 2),
               Count div 2, 3, -1, 16, (PLAYER_RECT.Height*2 div 3),
   g_GFX_Blood(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2)+8,
               FObj.Y+PLAYER_RECT.Y+(PLAYER_RECT.Height div 2),
               Count div 2, 3, -1, 16, (PLAYER_RECT.Height*2 div 3),

-              150, 0, 0);
+              FModel.Blood.R, FModel.Blood.G, FModel.Blood.B, FModel.Blood.Kind);

   g_GFX_Blood(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2)-8,
               FObj.Y+PLAYER_RECT.Y+(PLAYER_RECT.Height div 2),
               Count div 2, -3, -1, 16, (PLAYER_RECT.Height*2) div 3,
   g_GFX_Blood(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2)-8,
               FObj.Y+PLAYER_RECT.Y+(PLAYER_RECT.Height div 2),
               Count div 2, -3, -1, 16, (PLAYER_RECT.Height*2) div 3,

-              150, 0, 0);
+              FModel.Blood.R, FModel.Blood.G, FModel.Blood.B, FModel.Blood.Kind);

 end;
 
 procedure TPlayer.MakeBloodVector(Count: Word; VelX, VelY: Integer);
 end;
 
 procedure TPlayer.MakeBloodVector(Count: Word; VelX, VelY: Integer);


@@ -3517,7 +3553,7 @@ begin
   g_GFX_Blood(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2),
               FObj.Y+PLAYER_RECT.Y+(PLAYER_RECT.Height div 2),
               Count, VelX, VelY, 16, (PLAYER_RECT.Height*2) div 3,
   g_GFX_Blood(FObj.X+PLAYER_RECT.X+(PLAYER_RECT.Width div 2),
               FObj.Y+PLAYER_RECT.Y+(PLAYER_RECT.Height div 2),
               Count, VelX, VelY, 16, (PLAYER_RECT.Height*2) div 3,

-              150, 0, 0);
+              FModel.Blood.R, FModel.Blood.G, FModel.Blood.B, FModel.Blood.Kind);

 end;
 
 procedure TPlayer.QueueWeaponSwitch(Weapon: Byte);
 end;
 
 procedure TPlayer.QueueWeaponSwitch(Weapon: Byte);


@@ -3659,7 +3695,7 @@ begin
   if not switchAllowed then
   begin
     //HACK for weapon cycling
   if not switchAllowed then
   begin
     //HACK for weapon cycling

-    if (FNextWeap and $7000) <> 0 then FNextWeap := 0;
+    if (FNextWeap and $E000) <> 0 then FNextWeap := 0;

     exit;
   end;
 
     exit;
   end;
 


@@ -4766,6 +4802,30 @@ begin
     Result := 1;
 end;
 
     Result := 1;
 end;
 

+function TPlayer.followCorpse(): Boolean;
+var
+  i: Integer;
+begin
+  Result := False;
+  if FAlive or FSpectator then
+    Exit;
+  if (gCorpses = nil) or (Length(gCorpses) = 0) then
+    Exit;
+  for i := 0 to High(gCorpses) do
+    if gCorpses[i] <> nil then
+      if gCorpses[i].FPlayerUID = FUID then
+      begin
+        Result := True;
+        FObj.X := gCorpses[i].FObj.X;
+        FObj.Y := gCorpses[i].FObj.Y;
+        FObj.Vel.X := gCorpses[i].FObj.Vel.X;
+        FObj.Vel.Y := gCorpses[i].FObj.Vel.Y;
+        FObj.Accel.X := gCorpses[i].FObj.Accel.X;
+        FObj.Accel.Y := gCorpses[i].FObj.Accel.Y;
+        break;
+      end;
+end;
+

 procedure TPlayer.Update();
 var
   b: Byte;
 procedure TPlayer.Update();
 var
   b: Byte;


@@ -4842,7 +4902,8 @@ begin
 
     if FPhysics then
     begin
 
     if FPhysics then
     begin

-      g_Obj_Move(@FObj, True, True, True);
+      if not followCorpse() then
+        g_Obj_Move(@FObj, True, True, True);

       positionChanged(); // this updates spatial accelerators
     end;
 
       positionChanged(); // this updates spatial accelerators
     end;
 


@@ -4968,7 +5029,8 @@ begin
 
   if FPhysics then
   begin
 
   if FPhysics then
   begin

-    g_Obj_Move(@FObj, True, True, True);
+    if not followCorpse() then
+      g_Obj_Move(@FObj, True, True, True);

     positionChanged(); // this updates spatial accelerators
   end
   else
     positionChanged(); // this updates spatial accelerators
   end
   else


@@ -6213,6 +6275,7 @@ end;
 procedure TCorpse.Damage(Value: Word; vx, vy: Integer);
 var
   pm: TPlayerModel;
 procedure TCorpse.Damage(Value: Word; vx, vy: Integer);
 var
   pm: TPlayerModel;

+  Blood: TModelBlood;

 begin
   if FState = CORPSE_STATE_REMOVEME then
     Exit;
 begin
   if FState = CORPSE_STATE_REMOVEME then
     Exit;


@@ -6235,16 +6298,23 @@ begin
         pm := g_PlayerModel_Get(FModelName);
         pm.PlaySound(MODELSOUND_DIE, 5, FObj.X, FObj.Y);
         pm.Free;
         pm := g_PlayerModel_Get(FModelName);
         pm.PlaySound(MODELSOUND_DIE, 5, FObj.X, FObj.Y);
         pm.Free;

+
+        // Çëîâåùèé ñìåõ:
+        if (gBodyKillEvent <> -1)
+        and gDelayedEvents[gBodyKillEvent].Pending then
+          gDelayedEvents[gBodyKillEvent].Pending := False;
+        gBodyKillEvent := g_Game_DelayEvent(DE_BODYKILL, 1050, 0);

       end;
     end
   else
     begin
       end;
     end
   else
     begin

+      Blood := g_PlayerModel_GetBlood(FModelName);

       FObj.Vel.X := FObj.Vel.X + vx;
       FObj.Vel.Y := FObj.Vel.Y + vy;
       g_GFX_Blood(FObj.X+PLAYER_CORPSERECT.X+(PLAYER_CORPSERECT.Width div 2),
                   FObj.Y+PLAYER_CORPSERECT.Y+(PLAYER_CORPSERECT.Height div 2),
                   Value, vx, vy, 16, (PLAYER_CORPSERECT.Height*2) div 3,
       FObj.Vel.X := FObj.Vel.X + vx;
       FObj.Vel.Y := FObj.Vel.Y + vy;
       g_GFX_Blood(FObj.X+PLAYER_CORPSERECT.X+(PLAYER_CORPSERECT.Width div 2),
                   FObj.Y+PLAYER_CORPSERECT.Y+(PLAYER_CORPSERECT.Height div 2),
                   Value, vx, vy, 16, (PLAYER_CORPSERECT.Height*2) div 3,

-                  150, 0, 0);
+                  Blood.R, Blood.G, Blood.B, Blood.Kind);

     end;
 end;
 
     end;
 end;
 


@@ -6318,6 +6388,7 @@ begin
   utils.writeInt(st, Byte(FColor.B));
   // Îáúåêò òðóïà
   Obj_SaveState(st, @FObj);
   utils.writeInt(st, Byte(FColor.B));
   // Îáúåêò òðóïà
   Obj_SaveState(st, @FObj);

+  utils.writeInt(st, Word(FPlayerUID));

   // Åñòü ëè àíèìàöèÿ
   anim := (FAnimation <> nil);
   utils.writeBool(st, anim);
   // Åñòü ëè àíèìàöèÿ
   anim := (FAnimation <> nil);
   utils.writeBool(st, anim);


@@ -6350,6 +6421,7 @@ begin
   FColor.B := utils.readByte(st);
   // Îáúåêò òðóïà
   Obj_LoadState(@FObj, st);
   FColor.B := utils.readByte(st);
   // Îáúåêò òðóïà
   Obj_LoadState(@FObj, st);

+  FPlayerUID := utils.readWord(st);

   // Åñòü ëè àíèìàöèÿ
   anim := utils.readBool(st);
   // Åñëè åñòü - çàãðóæàåì
   // Åñòü ëè àíèìàöèÿ
   anim := utils.readBool(st);
   // Åñëè åñòü - çàãðóæàåì