render: use TPlayerModel for corpse drawing

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

diff --git a/src/game/g_panel.pas b/src/game/g_panel.pas
index 734e4cf01f9bd9d98ed95efef057bd66109e7845..71c653e29e8330a6924f182ceef8a485d5537ef8 100644 (file)
--- a/src/game/g_panel.pas
+++ b/src/game/g_panel.pas
@@ -23,16 +23,15 @@ uses
   MAPDEF, g_textures, xdynrec;
 
 type
   MAPDEF, g_textures, xdynrec;
 
 type

-  TAddTextureArray = Array of
-    record
-      Texture: Cardinal;
-      Anim: Boolean;
-    end;
+  TAddTextureArray = array of record
+    Texture: Cardinal; // Textures[Texture]
+  end;

 
   ATextureID = array of record
 
   ATextureID = array of record

+    Texture: Cardinal; // Textures[Texture]

     case Anim: Boolean of
     case Anim: Boolean of

-      False: (Tex: Cardinal);
-      True:  (AnTex: TAnimation);
+      False: ();
+      True:  (AnTex: TAnimationState);

   end;
 
   PPanel = ^TPanel;
   end;
 
   PPanel = ^TPanel;


@@ -41,8 +40,6 @@ type
     const
   private
     mGUID: Integer; // will be assigned in "g_map.pas"
     const
   private
     mGUID: Integer; // will be assigned in "g_map.pas"

-    FTextureWidth:    Word;
-    FTextureHeight:   Word;

     FAlpha:           Byte;
     FBlending:        Boolean;
     FTextureIDs:      ATextureID;
     FAlpha:           Byte;
     FBlending:        Boolean;
     FTextureIDs:      ATextureID;


@@ -195,8 +192,6 @@ type
 
     (* private state *)
     property Alpha: Byte read FAlpha;
 
     (* private state *)
     property Alpha: Byte read FAlpha;

-    property TextureWidth: Word read FTextureWidth;
-    property TextureHeight: Word read FTextureHeight;

     property Blending: Boolean read FBlending;
     property TextureIDs: ATextureID read FTextureIDs;
 
     property Blending: Boolean read FBlending;
     property TextureIDs: ATextureID read FTextureIDs;
 


@@ -228,7 +223,7 @@ var
 implementation
 
 uses
 implementation
 
 uses

-  e_texture, g_basic, g_map, g_game, g_gfx, g_weapons, g_triggers, g_items,
+  g_basic, g_map, g_game, g_gfx, g_weapons, g_triggers, g_items,

   g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams;
 
 const
   g_console, g_language, g_monsters, g_player, g_grid, e_log, geom, utils, xstreams;
 
 const


@@ -319,6 +314,8 @@ begin
     SetLength(FTextureIDs, 1);
     FTextureIDs[0].Anim := False;
 
     SetLength(FTextureIDs, 1);
     FTextureIDs[0].Anim := False;
 

+{
+    // !!! set this

     case PanelRec.PanelType of
       PANEL_WATER:
         FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_WATER);
     case PanelRec.PanelType of
       PANEL_WATER:
         FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_WATER);


@@ -327,6 +324,7 @@ begin
       PANEL_ACID2:
         FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_ACID2);
     end;
       PANEL_ACID2:
         FTextureIDs[0].Tex := LongWord(TEXTURE_SPECIAL_ACID2);
     end;

+}

 
     FCurTexture := 0;
     Exit;
 
     FCurTexture := 0;
     Exit;


@@ -344,19 +342,14 @@ begin
 
   for i := 0 to Length(FTextureIDs)-1 do
   begin
 
   for i := 0 to Length(FTextureIDs)-1 do
   begin

-    FTextureIDs[i].Anim := AddTextures[i].Anim;
+    FTextureIDs[i].Texture := AddTextures[i].Texture;
+    FTextureIDs[i].Anim := Textures[AddTextures[i].Texture].FramesCount > 0;

     if FTextureIDs[i].Anim then
     if FTextureIDs[i].Anim then

-      begin // Àíèìèðîâàííàÿ òåêñòóðà
-        FTextureIDs[i].AnTex :=
-           TAnimation.Create(Textures[AddTextures[i].Texture].FramesID,
-                             True, Textures[AddTextures[i].Texture].Speed);
-        FTextureIDs[i].AnTex.Blending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
-        FTextureIDs[i].AnTex.Alpha := PanelRec.Alpha;
-      end
-    else
-      begin // Îáû÷íàÿ òåêñòóðà
-        FTextureIDs[i].Tex := Textures[AddTextures[i].Texture].TextureID;
-      end;
+    begin // Àíèìèðîâàííàÿ òåêñòóðà
+      FTextureIDs[i].AnTex := TAnimationState.Create(True, Textures[AddTextures[i].Texture].Speed, Textures[AddTextures[i].Texture].FramesCount);
+      FTextureIDs[i].AnTex.Blending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
+      FTextureIDs[i].AnTex.Alpha := PanelRec.Alpha;
+    end

   end;
 
 // Òåêñòóð íåñêîëüêî - íóæíî ñîõðàíÿòü òåêóùóþ:
   end;
 
 // Òåêñòóð íåñêîëüêî - íóæíî ñîõðàíÿòü òåêóùóþ:


@@ -369,15 +362,11 @@ begin
   if ({PanelRec.TextureNum}tnum > High(Textures)) then
   begin
     e_WriteLog(Format('WTF?! tnum is out of limits! (%d : %d)', [tnum, High(Textures)]), TMsgType.Warning);
   if ({PanelRec.TextureNum}tnum > High(Textures)) then
   begin
     e_WriteLog(Format('WTF?! tnum is out of limits! (%d : %d)', [tnum, High(Textures)]), TMsgType.Warning);

-    FTextureWidth := 2;
-    FTextureHeight := 2;

     FAlpha := 0;
     FBlending := ByteBool(0);
   end
   else if not g_Map_IsSpecialTexture(Textures[{PanelRec.TextureNum}tnum].TextureName) then
   begin
     FAlpha := 0;
     FBlending := ByteBool(0);
   end
   else if not g_Map_IsSpecialTexture(Textures[{PanelRec.TextureNum}tnum].TextureName) then
   begin

-    FTextureWidth := Textures[{PanelRec.TextureNum}tnum].Width;
-    FTextureHeight := Textures[{PanelRec.TextureNum}tnum].Height;

     FAlpha := PanelRec.Alpha;
     FBlending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
   end;
     FAlpha := PanelRec.Alpha;
     FBlending := ByteBool(PanelRec.Flags and PANEL_FLAG_BLENDING);
   end;


@@ -952,14 +941,20 @@ end;
 function TPanel.GetTextureID(): DWORD;
 begin
   Result := LongWord(TEXTURE_NONE);
 function TPanel.GetTextureID(): DWORD;
 begin
   Result := LongWord(TEXTURE_NONE);

-
-  if (FCurTexture >= 0) then
-  begin
+//  if (FCurTexture >= 0) then
+//  begin
+//    if FTextureIDs[FCurTexture].Anim then
+//      Result := Textures[FTextureIDs[FCurTexture].Texture].FramesID
+//    else
+//      Result := Textures[FTextureIDs[FCurTexture].Texture].TextureID
+{
+    // !!! old behavior

     if FTextureIDs[FCurTexture].Anim then
       Result := FTextureIDs[FCurTexture].AnTex.FramesID
     else
       Result := FTextureIDs[FCurTexture].Tex;
     if FTextureIDs[FCurTexture].Anim then
       Result := FTextureIDs[FCurTexture].AnTex.FramesID
     else
       Result := FTextureIDs[FCurTexture].Tex;

-  end;
+}
+//  end

 end;
 
 function TPanel.GetTextureCount(): Integer;
 end;
 
 function TPanel.GetTextureCount(): Integer;