Main: Epic encoding and other bugs megafix!

[d2df-editor.git] / src / editor / f_addresource.pas

diff --git a/src/editor/f_addresource.pas b/src/editor/f_addresource.pas
index 514cf5cdfa6e42c8f6ed9f3d535425d79801da33..815fb1f38a8961a25fff67b9e211aa7d567a51a2 100644 (file)
--- 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
 
 // Внешний 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);
   else // WAD карты:
     begin
       g_ProcessResourceStr(OpenedMap, fn, sn, rn);


@@ -149,7 +149,7 @@ begin
 
 // Внешний WAD:
   if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then
 
 // Внешний 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);
   else // WAD карты:
     begin
       g_ProcessResourceStr(OpenedMap, fn, sn, rn);


@@ -160,12 +160,12 @@ begin
   WAD.ReadFile(FileName);
 
   if cbSectionsList.Text <> '..' then
   WAD.ReadFile(FileName);
 
   if cbSectionsList.Text <> '..' then

-    SectionName := utf2win(cbSectionsList.Text)
+    SectionName := cbSectionsList.Text

   else
     SectionName := '';
 
 // Читаем ресурсы выбранной секции:
   else
     SectionName := '';
 
 // Читаем ресурсы выбранной секции:

-  ResourceList := WAD.GetResourcesList(SectionName);
+  ResourceList := WAD.GetResourcesList(utf2win(SectionName));

 
   WAD.Free();
 
 
   WAD.Free();
 


@@ -194,14 +194,14 @@ begin
   if cbSectionsList.Text = '..' then
     SectionName := ''
   else
   if cbSectionsList.Text = '..' then
     SectionName := ''
   else

-    SectionName := utf2win(cbSectionsList.Text);
+    SectionName := cbSectionsList.Text;

 
   if cbWADList.Text[1] <> '<' then
 
   if cbWADList.Text[1] <> '<' then

-    FileName := utf2win(cbWADList.Text)
+    FileName := cbWADList.Text

   else
     FileName := '';
 
   else
     FileName := '';
 

-  FResourceName := FileName+':'+SectionName+'\'+utf2win(lbResourcesList.Items[lbResourcesList.ItemIndex]);
+  FResourceName := FileName+':'+SectionName+'\'+lbResourcesList.Items[lbResourcesList.ItemIndex];

 
   if FileName <> '' then
     FFullResourceName := EditorDir+'wads/'+FResourceName
 
   if FileName <> '' then
     FFullResourceName := EditorDir+'wads/'+FResourceName