X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_addresource.pas;h=103d9b031f3165cb39920cd042a8f4d56c5dcf3f;hb=3360cb5c3e96b591451afa67a0f8a281db79e8c5;hp=7703ab231a1324ae5b4db1c0600a6079b6a59c58;hpb=a77aef1652fcbea68ad2f5a7816625bce8debb00;p=d2df-editor.git

diff --git a/src/editor/f_addresource.pas b/src/editor/f_addresource.pas
index 7703ab2..103d9b0 100644
--- a/src/editor/f_addresource.pas
+++ b/src/editor/f_addresource.pas
@@ -45,7 +45,7 @@ var
 implementation
 
 uses
-  f_main, WADSTRUCT, g_language, utils, sfs;
+  f_main, WADSTRUCT, g_language, utils, sfs, g_options;
 
 {$R *.lfm}
 
@@ -64,8 +64,7 @@ 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);
@@ -81,15 +80,15 @@ begin
 
 // WAD карты:
   if OpenedMap <> '' then
-    cbWADList.Items.Add(_lc[I_WAD_SPECIAL_MAP]);
+    cbWADList.Items.Add(MsgWadSpecialMap);
 end;
 
 procedure TAddResourceForm.bOKClick(Sender: TObject);
 begin
   if FResourceName = '' then
   begin
-    MessageBox(0, PChar(_lc[I_MSG_CHOOSE_RES]),
-               PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
+    Application.MessageBox(PChar(MsgMsgChooseRes),
+               PChar(MsgMsgError), MB_OK + MB_ICONERROR);
     Exit;
   end;
 
@@ -108,8 +107,8 @@ procedure TAddResourceForm.cbWADListChange(Sender: TObject);
     i: Integer;
     FileName, Section, sn, rn: String;
 begin
-  if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then
-    FileName := EditorDir + 'wads/' + cbWADList.Text (* Resource wad *)
+  if cbWADList.Text <> MsgWadSpecialMap then
+    FileName := WadsDir + DirectorySeparator + cbWADList.Text (* Resource wad *)
   else
     g_ProcessResourceStr(OpenedMap, FileName, sn, rn); (* Map wad *)
 
@@ -138,8 +137,8 @@ procedure TAddResourceForm.cbSectionsListChange(Sender: TObject);
     i: Integer;
     FileName, Section, SectionName, sn, rn: String;
 begin
-  if cbWADList.Text <> _lc[I_WAD_SPECIAL_MAP] then
-    FileName := EditorDir + 'wads/' + cbWADList.Text (* Resource wad *)
+  if cbWADList.Text <> MsgWadSpecialMap then
+    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;