Main: Fixup encoding inconsistences

diff --git a/src/editor/f_packmap.pas b/src/editor/f_packmap.pas
index 00e3dc0372b3984515df0b1068ee1fb9d6de1763..e2551bae7ad58b17eec4aa4026c0dd5cd17e2b5f 100644 (file)
--- a/src/editor/f_packmap.pas
+++ b/src/editor/f_packmap.pas
@@ -107,7 +107,6 @@ end;
 
 procedure TPackMapForm.bPackClick(Sender: TObject);
 var
-  WadFile: String;
   mr: TMapReader_1;
   mw: TMapWriter_1;
   data: Pointer;

diff --git a/src/editor/f_savemap.pas b/src/editor/f_savemap.pas
index 14336d9e3581cffa64f538bcdebd7cfe9d227d74..6d9b947f2427633045c4e37a057b7b30a1f62add 100644 (file)
--- a/src/editor/f_savemap.pas
+++ b/src/editor/f_savemap.pas
@@ -100,7 +100,7 @@ begin
   begin
     for i := 0 to list.Count - 1 do
     begin
-      g_ReadResource(FileName, list.Files[i].path, list.Files[i].name, data, len);
+      g_ReadResource(FileName, win2utf(list.Files[i].path), win2utf(list.Files[i].name), data, len);
 
       if len >= 3 then
       begin

diff --git a/src/editor/f_selectmap.pas b/src/editor/f_selectmap.pas
index 2d4882dedef40fe543cea07b5fa6808315ad0f53..7474330705f0c70b96027895375359b9a5cffbed 100644 (file)
--- a/src/editor/f_selectmap.pas
+++ b/src/editor/f_selectmap.pas
@@ -67,7 +67,7 @@ begin
 
   for i := 0 to list.Count - 1 do
   begin
-    g_ReadResource(FileName, list.Files[i].path, list.Files[i].name, data, len);
+    g_ReadResource(FileName, win2utf(list.Files[i].path), win2utf(list.Files[i].name), data, len);
 
     if len >= 3 then
     begin

diff --git a/src/editor/g_resources.pas b/src/editor/g_resources.pas
index 0e383c3a565d8317103f87a0170500f4945f7eff..cc8e0a8ef717d655553178b73256c88abbe8bf81 100644 (file)
--- 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