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