From b5f9c55a34f89cc238eedc5f0c2620a2d8ba6687 Mon Sep 17 00:00:00 2001 From: binarymaster Date: Thu, 28 Sep 2017 16:39:32 +0300 Subject: [PATCH] AddResource: Fix non-ANSI encoding --- src/editor/f_addresource.pas | 6 +++--- src/editor/f_addresource_texture.pas | 2 +- src/editor/f_main.pas | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/editor/f_addresource.pas b/src/editor/f_addresource.pas index 514cf5c..edca4ed 100644 --- a/src/editor/f_addresource.pas +++ b/src/editor/f_addresource.pas @@ -114,7 +114,7 @@ begin // Внешний WAD: if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then - FileName := EditorDir+'wads/'+utf2win(cbWADList.Text) + FileName := EditorDir+'wads/'+cbWADList.Text else // WAD карты: begin g_ProcessResourceStr(OpenedMap, fn, sn, rn); @@ -149,7 +149,7 @@ begin // Внешний WAD: if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then - FileName := EditorDir+'wads/'+utf2win(cbWADList.Text) + FileName := EditorDir+'wads/'+cbWADList.Text else // WAD карты: begin g_ProcessResourceStr(OpenedMap, fn, sn, rn); @@ -197,7 +197,7 @@ begin SectionName := utf2win(cbSectionsList.Text); if cbWADList.Text[1] <> '<' then - FileName := utf2win(cbWADList.Text) + FileName := cbWADList.Text else FileName := ''; diff --git a/src/editor/f_addresource_texture.pas b/src/editor/f_addresource_texture.pas index f3b3fad..6c3840d 100644 --- a/src/editor/f_addresource_texture.pas +++ b/src/editor/f_addresource_texture.pas @@ -488,7 +488,7 @@ begin for i := 0 to lbResourcesList.Count-1 do if lbResourcesList.Selected[i] then begin - AddTexture(utf2win(cbWADlist.Text), utf2win(cbSectionsList.Text), + AddTexture(cbWADlist.Text, utf2win(cbSectionsList.Text), utf2win(lbResourcesList.Items[i]), False); lbResourcesList.Selected[i] := False; end; diff --git a/src/editor/f_main.pas b/src/editor/f_main.pas index 9065257..8bdab7d 100644 --- a/src/editor/f_main.pas +++ b/src/editor/f_main.pas @@ -1909,7 +1909,7 @@ begin else begin // Внешний WAD FileName := EditorDir+'wads/'+aWAD; - ResourceName := aWAD+':'+SectionName+'\'+aTex; + ResourceName := utf2win(aWAD)+':'+SectionName+'\'+aTex; end; ok := True; -- 2.29.2