From b834d54eac3c55d2943a92dc0087e624587f38ba Mon Sep 17 00:00:00 2001 From: DeaDDooMER Date: Mon, 22 May 2023 16:29:12 +0300 Subject: [PATCH] map: fix encoding while import ini maps --- src/editor/g_map.pas | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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; -- 2.29.2