From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Mon, 22 May 2023 13:29:12 +0000 (+0300)
Subject: map: fix encoding while import ini maps
X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=b834d54eac3c55d2943a92dc0087e624587f38ba;p=d2df-editor.git

map: fix encoding while import ini maps
---

diff --git a/src/editor/g_map.pas b/src/editor/g_map.pas
index 792f258..b74a403 100644
--- a/src/editor/g_map.pas
+++ b/src/editor/g_map.pas
@@ -1730,7 +1730,7 @@ begin
     MainForm.pbLoad.StepIt();
     Application.ProcessMessages();
 
-    s := TexturePrefix + UpperCase(map.ReadStr('Textures', 'TextureName'+IntToStr(a), ''));
+    s := TexturePrefix + UpperCase(win2utf(map.ReadStr('Textures', 'TextureName'+IntToStr(a), '')));
     if s = TexturePrefix then
       Continue;
 
@@ -1784,7 +1784,7 @@ begin
   // Текстура панели:
     if panel.PanelType in [PANEL_WALL, PANEL_BACK, PANEL_FORE, PANEL_STEP] then
       begin
-        s := TexturePrefix + UpperCase(map.ReadStr(section, 'TextureName', ''));
+        s := TexturePrefix + UpperCase(win2utf(map.ReadStr(section, 'TextureName', '')));
 
         if g_GetTexture(s, panel.TextureID) then
           begin
@@ -1897,8 +1897,8 @@ begin
 // Чтение параметров карты:
   with gMapInfo do
   begin
-    Name := map.ReadStr('MapOptions', 'MapName', '');
-    Description := map.ReadStr('MapOptions', 'MapDescription', '');
+    Name := win2utf(map.ReadStr('MapOptions', 'MapName', ''));
+    Description := win2utf(map.ReadStr('MapOptions', 'MapDescription', ''));
     Author := '';
     MusicName := DefaultMusRes;
     SkyName := DefaultSkyRes;