X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_addresource_sky.pas;h=49034d2239db2e0ff74db35a9d7756ef21496e92;hb=7bc7d5022ae82e37fee8b3003432f9294176a470;hp=9eea7180818843a5581e452b2be08036792ea845;hpb=66487b9264a791df057975695339448eb3d7ba2f;p=d2df-editor.git

diff --git a/src/editor/f_addresource_sky.pas b/src/editor/f_addresource_sky.pas
index 9eea718..49034d2 100644
--- a/src/editor/f_addresource_sky.pas
+++ b/src/editor/f_addresource_sky.pas
@@ -31,7 +31,7 @@ var
 implementation
 
 uses
-  BinEditor, WADEDITOR, f_main, g_language;
+  WADEDITOR, f_main, g_language, g_resources;
 
 {$R *.lfm}
 
@@ -48,23 +48,14 @@ var
   BitMap:     TBitMap;
 
   TextureData:  Pointer;
-  WAD:          TWADEditor_1;
   WADName:      String;
   SectionName:  String;
   ResourceName: String;
 
 begin
   Result := nil;
-
-// Загружаем ресурс текстуры из WAD:
   g_ProcessResourceStr(ResourceStr, WADName, SectionName, ResourceName);
-
-  WAD := TWADEditor_1.Create();
-  WAD.ReadFile(WADName);
-
-  WAD.GetResource(SectionName, ResourceName, TextureData, ImageSize);
-
-  WAD.Free();
+  g_ReadResource(WADName, SectionName, ResourceName, TextureData, ImageSize);
 
   InitImage(img);
   if not LoadImageFromMemory(TextureData, ImageSize, img) then
@@ -152,7 +143,7 @@ begin
       SectionName := '..';
 
   // WAD файл:
-    a := cbWADList.Items.IndexOf(win2utf(FileName));
+    a := cbWADList.Items.IndexOf(FileName);
     if a <> -1 then
     begin
       cbWADList.ItemIndex := a;
@@ -160,7 +151,7 @@ begin
     end;
 
   // Секция:
-    a := cbSectionsList.Items.IndexOf(win2utf(SectionName));
+    a := cbSectionsList.Items.IndexOf(SectionName);
     if a <> -1 then
     begin
       cbSectionsList.ItemIndex := a;
@@ -168,7 +159,7 @@ begin
     end;
 
   // Ресурс:
-    a := lbResourcesList.Items.IndexOf(win2utf(ResourceName));
+    a := lbResourcesList.Items.IndexOf(ResourceName);
     if a <> -1 then
     begin
       lbResourcesList.ItemIndex := a;