X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_map.pas;h=9cc29e34dfd3e2e0db4e340896bd3d32d1b07e0d;hb=3349a0b38bc1fae71b758cb1686d4f6d0bf4f926;hp=584a88f2b637679b28d719d0def9c9d38cfe6e42;hpb=cc934f758d8d3036fa3bca8a3cca949814e04d89;p=d2df-sdl.git

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 584a88f..9cc29e3 100644
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -1,10 +1,26 @@
+(* Copyright (C)  DooM 2D:Forever Developers
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *)
+{$MODE DELPHI}
 unit g_map;
 
 interface
 
 uses
   e_graphics, g_basic, MAPSTRUCT, g_textures, Classes,
-  g_phys, WADEDITOR, BinEditor, g_panel, md5;
+  g_phys, wadreader, BinEditor, g_panel, md5;
 
 type
   TMapInfo = record
@@ -39,7 +55,6 @@ type
     Direction:   TDirection;
   end;
 
-
 function  g_Map_Load(Res: String): Boolean;
 function  g_Map_GetMapInfo(Res: String): TMapInfo;
 function  g_Map_GetMapsList(WADName: String): SArray;
@@ -66,6 +81,8 @@ function  g_Map_HaveFlagPoints(): Boolean;
 procedure g_Map_ResetFlag(Flag: Byte);
 procedure g_Map_DrawFlags();
 
+function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
+
 procedure g_Map_SaveState(Var Mem: TBinMemoryWriter);
 procedure g_Map_LoadState(Var Mem: TBinMemoryReader);
 
@@ -117,14 +134,23 @@ uses
   GL, GLExt, g_weapons, g_game, g_sound, e_sound, CONFIG,
   g_options, MAPREADER, g_triggers, g_player, MAPDEF,
   Math, g_monsters, g_saveload, g_language, g_netmsg,
-  utils, sfs;
+  utils, sfs, g_scripts,
+  ImagingTypes, Imaging, ImagingUtility,
+  ImagingGif, ImagingNetworkGraphics;
 
 const
   FLAGRECT: TRectWH = (X:15; Y:12; Width:33; Height:52);
   MUSIC_SIGNATURE = $4953554D; // 'MUSI'
   FLAG_SIGNATURE = $47414C46; // 'FLAG'
 
+type
+  TPanelID = record
+    PWhere: ^TPanelArray;
+    PArrID: Integer;
+  end;
+
 var
+  PanelById:     array of TPanelID;
   Textures:      TLevelTextureArray;
   RespawnPoints: Array of TRespawnPoint;
   FlagPoints:    Array [FLAG_RED..FLAG_BLUE] of PFlagPoint;
@@ -344,11 +370,17 @@ begin
     panels^[len].SaveIt := True;
 
   Result := len;
+
+  len := Length(PanelByID);
+  SetLength(PanelByID, len + 1);
+  PanelByID[len].PWhere := panels;
+  PanelByID[len].PArrID := Result;
 end;
 
-procedure CreateNullTexture(RecName: String);
+function CreateNullTexture(RecName: String): Integer;
 begin
   SetLength(Textures, Length(Textures)+1);
+  result := High(Textures);
 
   with Textures[High(Textures)] do
   begin
@@ -360,22 +392,20 @@ begin
   end;
 end;
 
-function CreateTexture(RecName: String; Map: string; log: Boolean): Boolean;
+function CreateTexture(RecName: String; Map: string; log: Boolean): Integer;
 var
-  WAD: TWADEditor_1;
+  WAD: TWADFile;
   TextureData: Pointer;
-  WADName: String;
-  SectionName: String;
-  TextureName: String;
+  WADName, txname: String;
   a, ResLength: Integer;
 begin
-  Result := False;
+  Result := -1;
 
   if Textures <> nil then
     for a := 0 to High(Textures) do
       if Textures[a].TextureName = RecName then
       begin // Òåêñòóðà ñ òàêèì èìåíåì óæå åñòü
-        Result := True;
+        Result := a;
         Exit;
       end;
 
@@ -402,14 +432,14 @@ begin
       Anim := False;
     end;
 
-    Result := True;
+    result := High(Textures);
     Exit;
   end;
 
 // Çàãðóæàåì ðåñóðñ òåêñòóðû â ïàìÿòü èç WAD'à:
-  g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
+  WADName := g_ExtractWadName(RecName);
 
-  WAD := TWADEditor_1.Create();
+  WAD := TWADFile.Create();
 
   if WADName <> '' then
     WADName := GameDir+'/wads/'+WADName
@@ -418,142 +448,258 @@ begin
 
   WAD.ReadFile(WADName);
 
-  if WAD.GetResource(SectionName, TextureName, TextureData, ResLength) then
+  txname := RecName;
+  {
+  if (WADName = Map) and WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
+  begin
+    FreeMem(TextureData);
+    RecName := 'COMMON\ALIEN';
+  end;
+  }
+
+  if WAD.GetResource(g_ExtractFilePathName(RecName), TextureData, ResLength) then
     begin
       SetLength(Textures, Length(Textures)+1);
-      if not e_CreateTextureMem(TextureData, Textures[High(Textures)].TextureID) then
+      if not e_CreateTextureMem(TextureData, ResLength, Textures[High(Textures)].TextureID) then
         Exit;
       e_GetTextureSize(Textures[High(Textures)].TextureID,
                        @Textures[High(Textures)].Width,
                        @Textures[High(Textures)].Height);
       FreeMem(TextureData);
-      Textures[High(Textures)].TextureName := RecName;
+      Textures[High(Textures)].TextureName := {RecName}txname;
       Textures[High(Textures)].Anim := False;
 
-      Result := True;
+      result := High(Textures);
     end
   else // Íåò òàêîãî ðåóñðñà â WAD'å
+  begin
+    //e_WriteLog(Format('SHIT! Error loading texture %s : %s : %s', [RecName, txname, g_ExtractFilePathName(RecName)]), MSG_WARNING);
     if log then
       begin
         e_WriteLog(Format('Error loading texture %s', [RecName]), MSG_WARNING);
         //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
       end;
+  end;
 
   WAD.Free();
 end;
 
-function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Boolean;
+function CreateAnimTexture(RecName: String; Map: string; log: Boolean): Integer;
 var
-  WAD: TWADEditor_1;
-  TextureWAD: Pointer;
-  TextData: Pointer;
-  TextureData: Pointer;
-  cfg: TConfig;
+  WAD: TWADFile;
+  TextureWAD: PChar = nil;
+  ttw: PChar = nil;
+  TextData: Pointer = nil;
+  TextureData: Pointer = nil;
+  cfg: TConfig = nil;
   WADName: String;
-  SectionName: String;
-  TextureName: String;
-  ResLength: Integer;
+  ResLength, rrl: Integer;
   TextureResource: String;
   _width, _height, _framecount, _speed: Integer;
   _backanimation: Boolean;
+  //imgfmt: string;
+  ia: TDynImageDataArray = nil;
+  f, c, frdelay, frloop: Integer;
 begin
-  Result := False;
+  result := -1;
 
-// ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
-  g_ProcessResourceStr(RecName, WADName, SectionName, TextureName);
+  //e_WriteLog(Format('*** Loading animated texture "%s"', [RecName]), MSG_NOTIFY);
 
-  WAD := TWADEditor_1.Create();
+  // ×èòàåì WAD-ðåñóðñ àíèì.òåêñòóðû èç WAD'à â ïàìÿòü:
+  WADName := g_ExtractWadName(RecName);
 
-  if WADName <> '' then
-    WADName := GameDir+'/wads/'+WADName
-  else
-    WADName := Map;
+  WAD := TWADFile.Create();
+  try
+    if WADName <> '' then
+      WADName := GameDir+'/wads/'+WADName
+    else
+      WADName := Map;
 
-  WAD.ReadFile(WADName);
+    WAD.ReadFile(WADName);
 
-  if not WAD.GetResource(SectionName, TextureName, TextureWAD, ResLength) then
-  begin
-    if log then
+    if not WAD.GetResource(g_ExtractFilePathName(RecName), TextureWAD, ResLength) then
     begin
-      e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
-      //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+      if log then
+      begin
+        e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+        //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
+      end;
+      exit;
     end;
-    WAD.Free();
-    Exit;
-  end;
 
-  WAD.FreeWAD();
+    {TEST
+    if WADName = Map then
+    begin
+      //FreeMem(TextureWAD);
+      if not WAD.GetResource('COMMON/animation', TextureWAD, ResLength) then Halt(1);
+    end;
+    }
 
-  if not WAD.ReadMemory(TextureWAD, ResLength) then
-  begin
-    FreeMem(TextureWAD);
-    WAD.Free();
-    Exit;
-  end;
+    WAD.FreeWAD();
 
-// ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè:
-  if not WAD.GetResource('TEXT', 'ANIM', TextData, ResLength) then
-  begin
-    FreeMem(TextureWAD);
-    WAD.Free();
-    Exit;
-  end;
+    if ResLength < 6 then
+    begin
+      e_WriteLog(Format('Animated texture file "%s" too short', [RecName]), MSG_WARNING);
+      exit;
+    end;
 
-  cfg := TConfig.CreateMem(TextData, ResLength);
+    // ýòî ïòèöà? ýòî ñàìîë¸ò?
+    if (TextureWAD[0] = 'D') and (TextureWAD[1] = 'F') and
+       (TextureWAD[2] = 'W') and (TextureWAD[3] = 'A') and (TextureWAD[4] = 'D') then
+    begin
+      // íåò, ýòî ñóïåðìåí!
+      if not WAD.ReadMemory(TextureWAD, ResLength) then
+      begin
+        e_WriteLog(Format('Animated texture WAD file "%s" is invalid', [RecName]), MSG_WARNING);
+        exit;
+      end;
 
-  TextureResource := cfg.ReadStr('', 'resource', '');
+      // ×èòàåì INI-ðåñóðñ àíèì. òåêñòóðû è çàïîìèíàåì åãî óñòàíîâêè:
+      if not WAD.GetResource('TEXT/ANIM', TextData, ResLength) then
+      begin
+        e_WriteLog(Format('Animated texture file "%s" has invalid INI', [RecName]), MSG_WARNING);
+        exit;
+      end;
 
-  if TextureResource = '' then
-  begin
-    FreeMem(TextureWAD);
-    FreeMem(TextData);
-    WAD.Free();
-    cfg.Free();
-    Exit;
-  end;
+      cfg := TConfig.CreateMem(TextData, ResLength);
 
-  _width := cfg.ReadInt('', 'framewidth', 0);
-  _height := cfg.ReadInt('', 'frameheight', 0);
-  _framecount := cfg.ReadInt('', 'framecount', 0);
-  _speed := cfg.ReadInt('', 'waitcount', 0);
-  _backanimation := cfg.ReadBool('', 'backanimation', False);
+      TextureResource := cfg.ReadStr('', 'resource', '');
+      if TextureResource = '' then
+      begin
+        e_WriteLog(Format('Animated texture WAD file "%s" has no "resource"', [RecName]), MSG_WARNING);
+        exit;
+      end;
 
-  cfg.Free();
+      _width := cfg.ReadInt('', 'framewidth', 0);
+      _height := cfg.ReadInt('', 'frameheight', 0);
+      _framecount := cfg.ReadInt('', 'framecount', 0);
+      _speed := cfg.ReadInt('', 'waitcount', 0);
+      _backanimation := cfg.ReadBool('', 'backanimation', False);
 
-// ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü:
-  if not WAD.GetResource('TEXTURES', TextureResource, TextureData, ResLength) then
-  begin
-    FreeMem(TextureWAD);
-    FreeMem(TextData);
-    WAD.Free();
-    Exit;
-  end;
+      cfg.Free();
+      cfg := nil;
 
-  WAD.Free();
+      // ×èòàåì ðåñóðñ òåêñòóð (êàäðîâ) àíèì. òåêñòóðû â ïàìÿòü:
+      if not WAD.GetResource('TEXTURES/'+TextureResource, TextureData, ResLength) then
+      begin
+        e_WriteLog(Format('Animated texture WAD file "%s" has no texture "%s"', [RecName, 'TEXTURES/'+TextureResource]), MSG_WARNING);
+        exit;
+      end;
 
-  SetLength(Textures, Length(Textures)+1);
-  with Textures[High(Textures)] do
-  begin
-  // Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè:
-    if g_Frames_CreateMemory(@FramesID, '', TextureData,
-         _width, _height, _framecount, _backanimation) then
+      WAD.Free();
+      WAD := nil;
+
+      SetLength(Textures, Length(Textures)+1);
+      with Textures[High(Textures)] do
+      begin
+        // Ñîçäàåì êàäðû àíèì. òåêñòóðû èç ïàìÿòè:
+        if g_Frames_CreateMemory(@FramesID, '', TextureData, ResLength, _width, _height, _framecount, _backanimation) then
+        begin
+          TextureName := RecName;
+          Width := _width;
+          Height := _height;
+          Anim := True;
+          FramesCount := _framecount;
+          Speed := _speed;
+          result := High(Textures);
+        end
+        else
+        begin
+          if log then e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+        end;
+      end;
+    end
+    else
+    begin
+      // try animated image
+      {
+      imgfmt := DetermineMemoryFormat(TextureWAD, ResLength);
+      if length(imgfmt) = 0 then
+      begin
+        e_WriteLog(Format('Animated texture file "%s" has unknown format', [RecName]), MSG_WARNING);
+        exit;
+      end;
+      }
+      GlobalMetadata.ClearMetaItems();
+      GlobalMetadata.ClearMetaItemsForSaving();
+      if not LoadMultiImageFromMemory(TextureWAD, ResLength, ia) then
       begin
-        TextureName := RecName;
-        Width := _width;
-        Height := _height;
-        Anim := True;
-        FramesCount := _framecount;
-        Speed := _speed;
+        e_WriteLog(Format('Animated texture file "%s" cannot be loaded', [RecName]), MSG_WARNING);
+        exit;
+      end;
+      if length(ia) = 0 then
+      begin
+        e_WriteLog(Format('Animated texture file "%s" has no frames', [RecName]), MSG_WARNING);
+        exit;
+      end;
 
-        Result := True;
+      WAD.Free();
+      WAD := nil;
+
+      _width := ia[0].width;
+      _height := ia[0].height;
+      _framecount := length(ia);
+      _speed := 1;
+      _backanimation := false;
+      frdelay := -1;
+      frloop := -666;
+      if GlobalMetadata.HasMetaItem(SMetaFrameDelay) then
+      begin
+        //writeln(' frame delay: ', GlobalMetadata.MetaItems[SMetaFrameDelay]);
+        try
+          f := GlobalMetadata.MetaItems[SMetaFrameDelay];
+          frdelay := f;
+          if f < 0 then f := 0;
+          // rounding ;-)
+          c := f mod 28;
+          if c < 13 then c := 0 else c := 1;
+          f := (f div 28)+c;
+          if f < 1 then f := 1 else if f > 255 then f := 255;
+          _speed := f;
+        except
+        end;
+      end;
+      if GlobalMetadata.HasMetaItem(SMetaAnimationLoops) then
+      begin
+        //writeln(' frame loop : ', GlobalMetadata.MetaItems[SMetaAnimationLoops]);
+        try
+          f := GlobalMetadata.MetaItems[SMetaAnimationLoops];
+          frloop := f;
+          if f <> 0 then _backanimation := true; // non-infinite looping == forth-and-back
+        except
+        end;
+      end;
+      //writeln(' creating animated texture with ', length(ia), ' frames (delay:', _speed, '; backloop:', _backanimation, ') from "', RecName, '"...');
+      //for f := 0 to high(ia) do writeln('  frame #', f, ': ', ia[f].width, 'x', ia[f].height);
+      f := ord(_backanimation);
+      e_WriteLog(Format('Animated texture file "%s": %d frames (delay:%d; back:%d; frdelay:%d; frloop:%d), %dx%d', [RecName, length(ia), _speed, f, frdelay, frloop, _width, _height]), MSG_NOTIFY);
+
+      SetLength(Textures, Length(Textures)+1);
+      // cîçäàåì êàäðû àíèì. òåêñòóðû èç êàðòèíîê
+      if g_CreateFramesImg(ia, @Textures[High(Textures)].FramesID, '', _backanimation) then
+      begin
+        Textures[High(Textures)].TextureName := RecName;
+        Textures[High(Textures)].Width := _width;
+        Textures[High(Textures)].Height := _height;
+        Textures[High(Textures)].Anim := True;
+        Textures[High(Textures)].FramesCount := length(ia);
+        Textures[High(Textures)].Speed := _speed;
+        result := High(Textures);
+        //writeln(' CREATED!');
       end
-    else
-      if log then
-        e_WriteLog(Format('Error loading animation texture %s', [RecName]), MSG_WARNING);
+      else
+      begin
+        if log then e_WriteLog(Format('Error loading animation texture "%s" images', [RecName]), MSG_WARNING);
+      end;
+    end;
+  finally
+    for f := 0 to High(ia) do FreeImage(ia[f]);
+    WAD.Free();
+    cfg.Free();
+    if TextureWAD <> nil then FreeMem(TextureWAD);
+    if TextData <> nil then FreeMem(TextData);
+    if TextureData <> nil then FreeMem(TextureData);
   end;
-
-  FreeMem(TextureWAD);
-  FreeMem(TextData);
 end;
 
 procedure CreateItem(Item: TItemRec_1);
@@ -754,10 +900,11 @@ const
   DefaultMusRes = 'Standart.wad:STDMUS\MUS1';
   DefaultSkyRes = 'Standart.wad:STDSKY\SKY0';
 var
-  WAD: TWADEditor_1;
+  WAD: TWADFile;
   MapReader: TMapReader_1;
   Header: TMapHeaderRec_1;
   _textures: TTexturesRec1Array;
+  _texnummap: array of Integer; // `_textures` -> `Textures`
   panels: TPanelsRec1Array;
   items: TItemsRec1Array;
   monsters: TMonsterRec1Array;
@@ -773,12 +920,11 @@ var
                            DoorPanel: Integer;
                            ShotPanel: Integer;
                           end;
-  FileName, SectionName, ResName,
-  FileName2, s, TexName: String;
-  Data: Pointer;
-  Len: Integer;
+  FileName, mapResName, s, TexName, ScrStr: String;
+  Data, ScrText: Pointer;
+  Len, ScrLen: Integer;
   ok, isAnim, trigRef: Boolean;
-  CurTex: Integer;
+  CurTex, ntn: Integer;
 begin
   Result := False;
   gMapInfo.Map := Res;
@@ -788,27 +934,42 @@ begin
   sfsGCDisable(); // temporary disable removing of temporary volumes
   try
   // Çàãðóçêà WAD:
-    g_ProcessResourceStr(Res, FileName, SectionName, ResName);
-    e_WriteLog('Loading map WAD: ' + FileName, MSG_NOTIFY);
+    FileName := g_ExtractWadName(Res);
+    e_WriteLog('Loading map WAD: '+FileName, MSG_NOTIFY);
     g_Game_SetLoadingText(_lc[I_LOAD_WAD_FILE], 0, False);
 
-    WAD := TWADEditor_1.Create();
+    WAD := TWADFile.Create();
     if not WAD.ReadFile(FileName) then
     begin
       g_FatalError(Format(_lc[I_GAME_ERROR_MAP_WAD], [FileName]));
       WAD.Free();
       Exit;
     end;
-    if not WAD.GetResource('', ResName, Data, Len) then
+    //k8: why loader ignores path here?
+    mapResName := g_ExtractFileName(Res);
+    if not WAD.GetMapResource(mapResName, Data, Len) then
     begin
-      g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [ResName]));
+      g_FatalError(Format(_lc[I_GAME_ERROR_MAP_RES], [mapResName]));
       WAD.Free();
       Exit;
     end;
+    
+    // try to load the map script
+    g_Scripts_Reset(RESET_MAP);
+    ScrText := nil;
+    ScrLen := 0;
+    if WAD.GetResource('SCRIPTS/'+mapResName, ScrText, ScrLen) then
+    begin
+      g_Console_Add('SCRIPT: Found script for this map. Loading...');
+      SetString(ScrStr, ScrText, ScrLen);
+      g_Scripts_Load(ScrStr);
+      FreeMem(ScrText);
+    end;
+
     WAD.Free();
 
   // Çàãðóçêà êàðòû:
-    e_WriteLog('Loading map: ' + ResName, MSG_NOTIFY);
+    e_WriteLog('Loading map: '+mapResName, MSG_NOTIFY);
     g_Game_SetLoadingText(_lc[I_LOAD_MAP], 0, False);
     MapReader := TMapReader_1.Create();
 
@@ -825,12 +986,14 @@ begin
   // Çàãðóçêà òåêñòóð:
     g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], 0, False);
     _textures := MapReader.GetTextures();
+    _texnummap := nil;
 
   // Äîáàâëåíèå òåêñòóð â Textures[]:
     if _textures <> nil then
     begin
       e_WriteLog('  Loading textures:', MSG_NOTIFY);
       g_Game_SetLoadingText(_lc[I_LOAD_TEXTURES], High(_textures), False);
+      SetLength(_texnummap, length(_textures));
 
       for a := 0 to High(_textures) do
       begin
@@ -842,23 +1005,27 @@ begin
             SetLength(s, b-1);
             Break;
           end;
-        e_WriteLog('    Loading texture: ' + s, MSG_NOTIFY);
+        e_WriteLog(Format('    Loading texture #%d: %s', [a, s]), MSG_NOTIFY);
+        //if g_Map_IsSpecialTexture(s) then e_WriteLog('      SPECIAL!', MSG_NOTIFY);
       // Àíèìèðîâàííàÿ òåêñòóðà:
         if ByteBool(_textures[a].Anim) then
           begin
-            if not CreateAnimTexture(_textures[a].Resource, FileName, True) then
+            ntn := CreateAnimTexture(_textures[a].Resource, FileName, True);
+            if ntn < 0 then
             begin
               g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_ANIM], [s]));
-              CreateNullTexture(_textures[a].Resource);
+              ntn := CreateNullTexture(_textures[a].Resource);
             end;
           end
         else // Îáû÷íàÿ òåêñòóðà:
-          if not CreateTexture(_textures[a].Resource, FileName, True) then
+          ntn := CreateTexture(_textures[a].Resource, FileName, True);
+          if ntn < 0 then
           begin
             g_SimpleError(Format(_lc[I_GAME_ERROR_TEXTURE_SIMPLE], [s]));
-            CreateNullTexture(_textures[a].Resource);
+            ntn := CreateNullTexture(_textures[a].Resource);
           end;
 
+        _texnummap[a] := ntn; // fix texture number
         g_Game_StepLoading();
       end;
     end;
@@ -874,6 +1041,18 @@ begin
     g_Game_SetLoadingText(_lc[I_LOAD_PANELS], 0, False);
     panels := MapReader.GetPanels();
 
+    // check texture numbers for panels
+    for a := 0 to High(panels) do
+    begin
+      if panels[a].TextureNum > High(_textures) then
+      begin
+        e_WriteLog('error loading map: invalid texture index for panel', MSG_FATALERROR);
+        result := false;
+        exit;
+      end;
+      panels[a].TextureNum := _texnummap[panels[a].TextureNum];
+    end;
+
   // Ñîçäàíèå òàáëèöû òðèããåðîâ (ñîîòâåòñòâèå ïàíåëåé òðèããåðàì):
     if triggers <> nil then
     begin
@@ -981,21 +1160,21 @@ begin
                   if ByteBool(texture.Anim) then
                     begin // Íà÷àëüíàÿ - àíèìèðîâàííàÿ, èùåì àíèìèðîâàííóþ
                       isAnim := True;
-                      ok := CreateAnimTexture(TexName, FileName, False);
+                      ok := CreateAnimTexture(TexName, FileName, False) >= 0;
                       if not ok then
                       begin // Íåò àíèìèðîâàííîé, èùåì îáû÷íóþ
                         isAnim := False;
-                        ok := CreateTexture(TexName, FileName, False);
+                        ok := CreateTexture(TexName, FileName, False) >= 0;
                       end;
                     end
                   else
                     begin // Íà÷àëüíàÿ - îáû÷íàÿ, èùåì îáû÷íóþ
                       isAnim := False;
-                      ok := CreateTexture(TexName, FileName, False);
+                      ok := CreateTexture(TexName, FileName, False) >= 0;
                       if not ok then
                       begin // Íåò îáû÷íîé, èùåì àíèìèðîâàííóþ
                         isAnim := True;
-                        ok := CreateAnimTexture(TexName, FileName, False);
+                        ok := CreateAnimTexture(TexName, FileName, False) >= 0;
                       end;
                     end;
 
@@ -1039,6 +1218,8 @@ begin
           CurTex := 0;
         end;
 
+        //e_WriteLog(Format('panel #%d: TextureNum=%d; ht=%d; ht1=%d; atl=%d', [a, panels[a].TextureNum, High(_textures), High(Textures), High(AddTextures)]), MSG_NOTIFY);
+
       // Ñîçäàåì ïàíåëü è çàïîìèíàåì åå íîìåð:
         PanelID := CreatePanel(panels[a], AddTextures, CurTex, trigRef);
 
@@ -1150,17 +1331,16 @@ begin
     begin
       e_WriteLog('  Loading sky: ' + gMapInfo.SkyName, MSG_NOTIFY);
       g_Game_SetLoadingText(_lc[I_LOAD_SKY], 0, False);
-      g_ProcessResourceStr(gMapInfo.SkyName, FileName, SectionName, ResName);
+      FileName := g_ExtractWadName(gMapInfo.SkyName);
 
       if FileName <> '' then
         FileName := GameDir+'/wads/'+FileName
       else
         begin
-          g_ProcessResourceStr(Res, @FileName2, nil, nil);
-          FileName := FileName2;
+          FileName := g_ExtractWadName(Res);
         end;
 
-      s := FileName+':'+SectionName+'/'+ResName;
+      s := FileName+':'+g_ExtractFilePathName(gMapInfo.SkyName);
       if g_Texture_CreateWAD(BackID, s) then
         begin
           g_Game_SetupScreenSize();
@@ -1175,17 +1355,16 @@ begin
     begin
       e_WriteLog('  Loading music: ' + gMapInfo.MusicName, MSG_NOTIFY);
       g_Game_SetLoadingText(_lc[I_LOAD_MUSIC], 0, False);
-      g_ProcessResourceStr(gMapInfo.MusicName, FileName, SectionName, ResName);
+      FileName := g_ExtractWadName(gMapInfo.MusicName);
 
       if FileName <> '' then
         FileName := GameDir+'/wads/'+FileName
       else
         begin
-          g_ProcessResourceStr(Res, @FileName2, nil, nil);
-          FileName := FileName2;
+          FileName := g_ExtractWadName(Res);
         end;
 
-      s := FileName+':'+SectionName+'/'+ResName;
+      s := FileName+':'+g_ExtractFilePathName(gMapInfo.MusicName);
       if g_Sound_CreateWADEx(gMapInfo.MusicName, s, True) then
         ok := True
       else
@@ -1231,24 +1410,25 @@ end;
 
 function g_Map_GetMapInfo(Res: String): TMapInfo;
 var
-  WAD: TWADEditor_1;
+  WAD: TWADFile;
   MapReader: TMapReader_1;
   Header: TMapHeaderRec_1;
-  FileName, SectionName, ResName: String;
+  FileName: String;
   Data: Pointer;
   Len: Integer;
 begin
   FillChar(Result, SizeOf(Result), 0);
-  g_ProcessResourceStr(Res, FileName, SectionName, ResName);
+  FileName := g_ExtractWadName(Res);
 
-  WAD := TWADEditor_1.Create();
+  WAD := TWADFile.Create();
   if not WAD.ReadFile(FileName) then
   begin
     WAD.Free();
     Exit;
   end;
 
-  if not WAD.GetResource('', ResName, Data, Len) then
+  //k8: it ignores path again
+  if not WAD.GetMapResource(g_ExtractFileName(Res), Data, Len) then
   begin
     WAD.Free();
     Exit;
@@ -1283,68 +1463,53 @@ end;
 
 function g_Map_GetMapsList(WADName: string): SArray;
 var
-  WAD: TWADEditor_1;
+  WAD: TWADFile;
   a: Integer;
   ResList: SArray;
-  Data: Pointer;
-  Len: Integer;
-  Sign: Array [0..2] of Char;
 begin
   Result := nil;
-
-  WAD := TWADEditor_1.Create();
+  WAD := TWADFile.Create();
   if not WAD.ReadFile(WADName) then
   begin
     WAD.Free();
     Exit;
   end;
-
-  ResList := WAD.GetResourcesList('');
-
+  ResList := WAD.GetMapResources();
   if ResList <> nil then
+  begin
     for a := 0 to High(ResList) do
     begin
-      if not WAD.GetResource('', ResList[a], Data, Len) then Continue;
-      CopyMemory(@Sign[0], Data, 3);
-      FreeMem(Data);
-
-      if Sign = MAP_SIGNATURE then
-      begin
-        SetLength(Result, Length(Result)+1);
-        Result[High(Result)] := ResList[a];
-      end;
-
-      Sign := '';
+      SetLength(Result, Length(Result)+1);
+      Result[High(Result)] := ResList[a];
     end;
-
+  end;
   WAD.Free();
 end;
 
 function g_Map_Exist(Res: string): Boolean;
 var
-  WAD: TWADEditor_1;
-  FileName, SectionName, ResName: string;
+  WAD: TWADFile;
+  FileName, mnn: string;
   ResList: SArray;
   a: Integer;
 begin
   Result := False;
 
-  g_ProcessResourceStr(Res, FileName, SectionName, ResName);
-
-  FileName := addWadExtension(FileName);
+  FileName := addWadExtension(g_ExtractWadName(Res));
 
-  WAD := TWADEditor_1.Create;
+  WAD := TWADFile.Create;
   if not WAD.ReadFile(FileName) then
   begin
     WAD.Free();
     Exit;
   end;
 
-  ResList := WAD.GetResourcesList('');
+  ResList := WAD.GetMapResources();
   WAD.Free();
 
+  mnn := g_ExtractFileName(Res);
   if ResList <> nil then
-    for a := 0 to High(ResList) do if ResList[a] = ResName then
+    for a := 0 to High(ResList) do if StrEquCI1251(ResList[a], mnn) then
     begin
       Result := True;
       Exit;
@@ -1433,6 +1598,8 @@ begin
 
   gDoorMap := nil;
   gLiftMap := nil;
+
+  PanelByID := nil;
 end;
 
 procedure g_Map_Update();
@@ -2148,4 +2315,15 @@ begin
 ///// /////
 end;
 
+function g_Map_PanelForPID(PanelID: Integer; var PanelArrayID: Integer): PPanel;
+var
+  Arr: TPanelArray;
+begin
+  Result := nil;
+  if (PanelID < 0) or (PanelID > High(PanelByID)) then Exit;
+  Arr := PanelByID[PanelID].PWhere^;
+  PanelArrayID := PanelByID[PanelID].PArrID;
+  Result := Addr(Arr[PanelByID[PanelID].PArrID]);
+end;
+
 end.