X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_playermodel.pas;h=86d5b5a8be9b8d124ad79aa872302319d3d5c076;hb=f9982f4e6fd7f5d7cd3b09ee1ebb01d5f06e6e8a;hp=e2db8d47acabb897be51d738f0ef854794355c55;hpb=b796b9f7b887de367bb71ccf5acdd3e39d82ebd2;p=d2df-sdl.git

diff --git a/src/game/g_playermodel.pas b/src/game/g_playermodel.pas
index e2db8d4..86d5b5a 100644
--- a/src/game/g_playermodel.pas
+++ b/src/game/g_playermodel.pas
@@ -18,9 +18,7 @@ unit g_playermodel;
 
 interface
 
-uses
-  MAPDEF, g_textures, g_base, g_basic, g_weapons, r_graphics, utils, g_gfx,
-  ImagingTypes, Imaging, ImagingUtility;
+  uses MAPDEF, g_textures, g_base, g_basic, g_weapons, utils, g_gfx;
 
 const
   A_STAND      = 0;
@@ -137,6 +135,8 @@ function  g_PlayerModel_Get(ModelName: String): TPlayerModel;
 function  g_PlayerModel_GetGibs (ModelID: Integer; var Gibs: TGibsArray): Boolean;
 function  g_PlayerModel_GetIndex (ModelName: String): Integer;
 
+procedure g_PlayerModel_LoadFake (ModelName, FileName: String);
+
 (* --- private data --- *)
 
   type
@@ -168,7 +168,7 @@ function  g_PlayerModel_GetIndex (ModelName: String): Integer;
 implementation
 
 uses
-  g_sound, g_console, SysUtils, g_player, CONFIG, r_textures, r_animations,
+  g_sound, g_console, SysUtils, g_player, CONFIG,
   e_sound, g_options, g_map, Math, e_log, wadreader;
 
 const
@@ -297,64 +297,15 @@ end;
     end;
   end;
 
-function g_PlayerModel_CalcGibSize (pData: Pointer; dataSize, x, y, w, h: Integer): TRectWH;
-  var i, j: Integer; done: Boolean; img: TImageData;
-
-  function IsVoid (i, j: Integer): Boolean;
-  begin
-    result := Byte((PByte(img.bits) + (y+j)*img.width*4 + (x+i)*4 + 3)^) = 0
-  end;
-
-begin
-  InitImage(img);
-  assert(LoadImageFromMemory(pData, dataSize, img));
-
-  (* trace x from right to left *)
-  done := false; i := 0;
-  while not done and (i < w) do
-  begin
-    j := 0;
-    while (j < h) and IsVoid(i, j) do inc(j);
-    done := (j < h) and (IsVoid(i, j) = false);
-    result.x := i;
-    inc(i);
-  end;
-
-  (* trace y from up to down *)
-  done := false; j := 0;
-  while not done and (j < h) do
+  procedure g_PlayerModel_LoadFake (ModelName, FileName: String);
+    var id: Integer;
   begin
-    i := 0;
-    while (i < w) and IsVoid(i, j) do inc(i);
-    done := (i < w) and (IsVoid(i, j) = false);
-    result.y := j;
-    inc(j);
+    SetLength(PlayerModelsArray, Length(PlayerModelsArray) + 1);
+    id := High(PlayerModelsArray);
+    PlayerModelsArray[id].Name := ModelName;
+    PlayerModelsArray[id].HaveWeapon := False;
+    PlayerModelsArray[id].FileName := FileName;
   end;
-  
-  (* trace x from right to left *)
-  done := false; i := w - 1;
-  while not done and (i >= 0) do
-  begin
-    j := 0;
-    while (j < h) and IsVoid(i, j) do inc(j);
-    done := (j < h) and (IsVoid(i, j) = false);
-    result.width := i - result.x + 1;
-    dec(i);
-  end;
-
-  (* trace y from down to up *)
-  done := false; j := h - 1;
-  while not done and (j >= 0) do
-  begin
-    i := 0;
-    while (i < w) and IsVoid(i, j) do inc(i);
-    done := (i < w) and (IsVoid(i, j) = false);
-    result.height := j - result.y + 1;
-    dec(j);
-  end;
-
-  FreeImage(img);
-end;
 
 function g_PlayerModel_Load(FileName: string): Boolean;
 var
@@ -798,7 +749,7 @@ end;
   procedure TPlayerModel.SetFire (Fire: Boolean);
   begin
     if Fire then
-      FFireCounter := PlayerModelsArray[FID].ModelSpeed[A_ATTACK] * PlayerModelsArray[FID].Anim[TDirection.D_RIGHT, A_ATTACK].Frames
+      FFireCounter := PlayerModelsArray[FID].ModelSpeed[A_ATTACK] * PlayerModelsArray[FID].Anim[TDirection.D_RIGHT, A_ATTACK].Frames + 1
     else
       FFireCounter := 0
   end;