Revert to old wad read/write method

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

diff --git a/src/editor/f_addresource_sky.pas b/src/editor/f_addresource_sky.pas
index e4a0f44fd86d0fd26a16b09a37572f0773f75e5b..e7b03613ddcb20db4c4f00e523db8b1647548905 100644 (file)
--- a/src/editor/f_addresource_sky.pas
+++ b/src/editor/f_addresource_sky.pas
@@ -31,7 +31,7 @@ var
 implementation
 
 uses
-  WADEDITOR, f_main, g_language, g_resources;
+  BinEditor, WADEDITOR, f_main, g_language;
 
 {$R *.lfm}
 
@@ -47,14 +47,23 @@ var
 
   TextureData:  Pointer;
   ImageSize:    Integer;
+  WAD:          TWADEditor_1;
   WADName:      String;
   SectionName:  String;
   ResourceName: String;
 
 begin
   Result := nil;
+
+// Загружаем ресурс текстуры из WAD:
   g_ProcessResourceStr(ResourceStr, WADName, SectionName, ResourceName);
-  g_ReadResource(WADName, SectionName, ResourceName, TextureData, ImageSize);
+
+  WAD := TWADEditor_1.Create();
+  WAD.ReadFile(WADName);
+
+  WAD.GetResource(utf2win(SectionName), utf2win(ResourceName), TextureData, ImageSize);
+
+  WAD.Free();
 
   (* !!! copypaste from f_addresource_texture.CreateBitMap *)
 
@@ -148,7 +157,7 @@ begin
     g_ProcessResourceStr(FSetResource, FileName, SectionName, ResourceName);
 
     if FileName = '' then
-      FileName := _lc[I_WAD_SPECIAL_MAP];
+      FileName := MsgWadSpecialMap;
     if SectionName = '' then
       SectionName := '..';