sfs, wadreader: much better searching for files inside archives with extra dirs in...

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

diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas
index e26ad7c05d796ca73a32e4442505a04fd3be7456..cd9d3b93244a371f0c89cc751575f78bb0106474 100644 (file)
--- a/src/game/g_gui.pas
+++ b/src/game/g_gui.pas
@@ -1,3 +1,4 @@
+{$MODE DELPHI}
 unit g_gui;
 
 interface
@@ -2468,12 +2469,12 @@ var
   panels: TPanelsRec1Array;
   header: TMapHeaderRec_1;
   a: Integer;
-  FileName, SectionName, ResName: string;
+  FileName: string;
   Data: Pointer;
   Len: Integer;
   rX, rY: Single;
 begin
-  g_ProcessResourceStr(Res, FileName, SectionName, ResName);
+  FileName := g_ExtractWadName(Res);
 
   WAD := TWADFile.Create();
   if not WAD.ReadFile(FileName) then
@@ -2482,7 +2483,8 @@ begin
     Exit;
   end;
 
-  if not WAD.GetResource('', ResName, Data, Len) then
+  //k8: ignores path again
+  if not WAD.GetMapResource(g_ExtractFileName(Res), Data, Len) then
   begin
     WAD.Free();
     Exit;