X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Fg_resources.pas;h=cc8e0a8ef717d655553178b73256c88abbe8bf81;hp=0e383c3a565d8317103f87a0170500f4945f7eff;hb=24d173d1ebd972a69c80d3e4e6dfea86c9a144e1;hpb=ecf69fd49c810dc4fe78092ec1f0204cbb719e01 diff --git a/src/editor/g_resources.pas b/src/editor/g_resources.pas index 0e383c3..cc8e0a8 100644 --- a/src/editor/g_resources.pas +++ b/src/editor/g_resources.pas @@ -121,7 +121,6 @@ implementation var f: TWADEditor_1; begin res := 1; (* error *) - wad := utf2win(wad); section := utf2win(NoTrailing(section)); name := utf2win(name); ASSERT(name <> ''); @@ -176,7 +175,7 @@ implementation path := NoTrailing(list.Files[i].path); if (path <> section) or (list.Files[i].name <> name) then begin - g_ReadResource(wad, path, list.Files[i].name, data0, len0); + g_ReadResource(wad, win2utf(path), win2utf(list.Files[i].name), data0, len0); ASSERT(data0 <> nil); if path = '' then path := list.Files[i].name @@ -274,7 +273,7 @@ implementation path := NoTrailing(list.Files[i].path); if (path <> section) or (list.Files[i].name <> name) then begin - g_ReadResource(wad, path, list.Files[i].name, data0, len0); + g_ReadResource(wad, win2utf(path), win2utf(list.Files[i].name), data0, len0); ASSERT(data0 <> nil); if path = '' then path := list.Files[i].name