added preview background

[d2df-editor.git] / src / editor / g_map.pas

diff --git a/src/editor/g_map.pas b/src/editor/g_map.pas
index d61a0e2c2fc57d1617ca4b2220de416176c749b2..1be82b6cb7d05cc3ffdc4c9e2373ae81c4dc937d 100644 (file)
--- a/src/editor/g_map.pas
+++ b/src/editor/g_map.pas
@@ -1378,7 +1378,7 @@ var
   FileName, SectionName, ResName, _fn: String;
   TextureRes: String;
   pData: Pointer;
   FileName, SectionName, ResName, _fn: String;
   TextureRes: String;
   pData: Pointer;

-  Len: Integer;
+  Len, FrameLen: Integer;

   Error: Boolean;
   NoTextureID: DWORD;
   NW, NH: Word;
   Error: Boolean;
   NoTextureID: DWORD;
   NW, NH: Word;


@@ -1457,14 +1457,14 @@ begin
         end
       else // Anim
         begin // Анимированная текстура
         end
       else // Anim
         begin // Анимированная текстура

-          if not GetFrame(TextureRes, Data, Width, Height) then
+          if not GetFrame(TextureRes, Data, FrameLen, Width, Height) then

           begin // Кадры
             e_WriteLog(Format('GetFrame() error, res=%s',
                               [textures[a].Resource]), MSG_WARNING);
             Error := True;
           end;
 
           begin // Кадры
             e_WriteLog(Format('GetFrame() error, res=%s',
                               [textures[a].Resource]), MSG_WARNING);
             Error := True;
           end;
 

-          if not g_CreateTextureMemorySize(Data, textures[a].Resource, 0, 0, Width, Height, 1) then
+          if not g_CreateTextureMemorySize(Data, FrameLen, textures[a].Resource, 0, 0, Width, Height, 1) then

           begin // Сама текстура
             e_WriteLog(Format('g_CreateTextureMemorySize() error, res=%s',
                               [textures[a].Resource]), MSG_WARNING);
           begin // Сама текстура
             e_WriteLog(Format('g_CreateTextureMemorySize() error, res=%s',
                               [textures[a].Resource]), MSG_WARNING);


@@ -2716,6 +2716,7 @@ end;
 
 procedure LoadData();
 begin
 
 procedure LoadData();
 begin

+ g_CreateTextureWAD('PREVIEW', EditorDir+'\data\Editor.wad:TEXTURES\CHECKERS');

  g_CreateTextureWAD('NOTEXTURE', EditorDir+'\data\Game.wad:TEXTURES\NOTEXTURE');
 
  g_CreateTextureWADSize('AREA_REDFLAG', EditorDir+'\data\Game.wad:TEXTURES\FLAGRED', 0, 0, 64, 64);
  g_CreateTextureWAD('NOTEXTURE', EditorDir+'\data\Game.wad:TEXTURES\NOTEXTURE');
 
  g_CreateTextureWADSize('AREA_REDFLAG', EditorDir+'\data\Game.wad:TEXTURES\FLAGRED', 0, 0, 64, 64);