proper (i hope) support for '.wad', '.pk3' and '.zip' extensions

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

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 90cb224e401f03ba139123567a9177b77e6c16c8..84ebb9555b11ddee98d22ace33c0c02a025a5097 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -116,7 +116,8 @@ uses
   g_main, e_log, SysUtils, g_items, g_gfx, g_console,
   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;
+  Math, g_monsters, g_saveload, g_language, g_netmsg,
+  utils;
 
 const
   FLAGRECT: TRectWH = (X:15; Y:12; Width:33; Height:52);
@@ -435,7 +436,7 @@ begin
     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);
+        //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
       end;
 
   WAD.Free();
@@ -475,7 +476,7 @@ begin
     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);
+      //e_WriteLog(Format('WAD Reader error: %s', [WAD.GetLastErrorStr]), MSG_WARNING);
     end;
     WAD.Free();
     Exit;
@@ -1325,7 +1326,7 @@ begin
 
   g_ProcessResourceStr(Res, FileName, SectionName, ResName);
 
-  if Pos('.wad', LowerCase(FileName)) = 0 then FileName := FileName+'.wad';
+  FileName := addWadExtension(FileName);
 
   WAD := TWADEditor_1.Create;
   if not WAD.ReadFile(FileName) then