X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_gui.pas;h=9319e45a7b9e29550da578fa07bf4af5ac32dc25;hb=af3c404e11867c6794975f1d45dd98932d804ede;hp=e26ad7c05d796ca73a32e4442505a04fd3be7456;hpb=844441154d1220d6c83f75043300c2851ec87109;p=d2df-sdl.git diff --git a/src/game/g_gui.pas b/src/game/g_gui.pas index e26ad7c..9319e45 100644 --- 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.GetResource(g_ExtractFileName(Res), Data, Len) then begin WAD.Free(); Exit;