X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_addresource.pas;h=f738384273e0e92aa8d74d2656175ef08389f274;hb=2789c629b21057292614b015b9a03595bab89c2f;hp=69b214e75e6a48b451335859dd9465950be05890;hpb=7bc7d5022ae82e37fee8b3003432f9294176a470;p=d2df-editor.git

diff --git a/src/editor/f_addresource.pas b/src/editor/f_addresource.pas
index 69b214e..f738384 100644
--- a/src/editor/f_addresource.pas
+++ b/src/editor/f_addresource.pas
@@ -45,12 +45,12 @@ var
 implementation
 
 uses
-  f_main, WADSTRUCT, g_language, utils, sfs;
+  f_main, WADSTRUCT, g_language, utils, sfs, g_options;
 
 {$R *.lfm}
 
 const
-  STANDART_WAD = 'Standart.wad';
+  STANDART_WAD = 'standart.wad';
 
 procedure TAddResourceForm.FormActivate(Sender: TObject);
   var
@@ -64,15 +64,14 @@ begin
   FFullResourceName := '';
   FResourceSelected := False;
 
-  ChDir(EditorDir);
-  if FindFirst(EditorDir + 'wads/*.*', faAnyFile, SR) = 0 then
+  if FindFirst(WadsDir + DirectorySeparator + '*.*', faAnyFile, SR) = 0 then
   repeat
     if (SR.name <> '.') and (SR.name <> '..') then
       cbWADList.Items.Add(SR.Name);
   until FindNext(SR) <> 0;
   FindClose(SR);
 
-// "Standart.wad" в начало списка:
+// "standart.wad" в начало списка:
   if cbWADList.Items.IndexOf(STANDART_WAD) > 0 then
   begin
     cbWADList.Items.Delete(cbWADList.Items.IndexOf(STANDART_WAD));
@@ -88,7 +87,7 @@ procedure TAddResourceForm.bOKClick(Sender: TObject);
 begin
   if FResourceName = '' then
   begin
-    MessageBox(0, PChar(_lc[I_MSG_CHOOSE_RES]),
+    Application.MessageBox(PChar(_lc[I_MSG_CHOOSE_RES]),
                PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
     Exit;
   end;
@@ -109,7 +108,7 @@ procedure TAddResourceForm.cbWADListChange(Sender: TObject);
     FileName, Section, sn, rn: String;
 begin
   if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then
-    FileName := EditorDir + 'wads/' + cbWADList.Text (* Resource wad *)
+    FileName := WadsDir + DirectorySeparator + cbWADList.Text (* Resource wad *)
   else
     g_ProcessResourceStr(OpenedMap, FileName, sn, rn); (* Map wad *)
 
@@ -139,7 +138,7 @@ procedure TAddResourceForm.cbSectionsListChange(Sender: TObject);
     FileName, Section, SectionName, sn, rn: String;
 begin
   if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then
-    FileName := EditorDir + 'wads/' + cbWADList.Text (* Resource wad *)
+    FileName := WadsDir + DirectorySeparator + cbWADList.Text (* Resource wad *)
   else
     g_ProcessResourceStr(OpenedMap, FileName, sn, rn); (* Map wad *)
 
@@ -180,7 +179,7 @@ begin
 
   g_ProcessResourceStr(OpenedMap, @fn, nil, nil);
   if FileName <> '' then
-    FFullResourceName := EditorDir + 'wads/' + FResourceName
+    FFullResourceName := WadsDir + DirectorySeparator + FResourceName
   else
     FFullResourceName := fn + FResourceName
 end;