X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_packmap.pas;h=f06f5c8c6b15e7715131a600304fc5abf2f1c7b3;hb=3360cb5c3e96b591451afa67a0f8a281db79e8c5;hp=00e3dc0372b3984515df0b1068ee1fb9d6de1763;hpb=ecf69fd49c810dc4fe78092ec1f0204cbb719e01;p=d2df-editor.git

diff --git a/src/editor/f_packmap.pas b/src/editor/f_packmap.pas
index 00e3dc0..f06f5c8 100644
--- a/src/editor/f_packmap.pas
+++ b/src/editor/f_packmap.pas
@@ -53,7 +53,7 @@ implementation
 
 uses
   BinEditor, WADEDITOR, g_map, MAPREADER, MAPWRITER, MAPSTRUCT,
-  f_main, math, g_language, g_resources, e_log;
+  f_main, math, g_language, g_resources, g_options, e_log;
 
 {$R *.lfm}
 
@@ -64,7 +64,7 @@ const
 
 procedure TPackMapForm.bSelectWADClick(Sender: TObject);
 begin
-  SaveDialog.Filter := _lc[I_FILE_FILTER_WAD];
+  SaveDialog.Filter := MsgFileFilterWad;
 
   if SaveDialog.Execute() then
     eWAD.Text := SaveDialog.FileName;
@@ -80,7 +80,7 @@ begin
   if filename = '' then
     g_GetResourceSection(OpenedMap, filename, us, un)
   else
-    filename := EditorDir + 'wads/' + filename;
+    filename := WadsDir + DirectorySeparator + filename;
   e_WriteLog('ProcessResource: "' + wad_to + '" "' + section_to + '" "' + filename + '" "' + section + '" "' + resource + '"', MSG_NOTIFY);
 
   if resource = '' then Exit;
@@ -99,15 +99,14 @@ begin
   end
   else
   begin
-    //MessageBox(0, PChar(Format(_lc[I_MSG_WAD_ERROR], [ExtractFileName(filename)])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
-    MessageBox(0, PChar(Format(_lc[I_MSG_RES_ERROR], [filename, section, resource])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
+    //Application.MessageBox(PChar(Format(MsgMsgWadError, [ExtractFileName(filename)])), PChar(MsgMsgError), MB_OK + MB_ICONERROR);
+    Application.MessageBox(PChar(Format(MsgMsgResError, [filename, section, resource])), PChar(MsgMsgError), MB_OK + MB_ICONERROR);
     Result := False
   end
 end;
 
 procedure TPackMapForm.bPackClick(Sender: TObject);
 var
-  WadFile: String;
   mr: TMapReader_1;
   mw: TMapWriter_1;
   data: Pointer;
@@ -310,12 +309,12 @@ begin
   Close();
 
   ASSERT(a = 0); (* saved *)
-  MessageDlg(Format(_lc[I_MSG_PACKED], [eResource.Text, ExtractFileName(eWAD.Text)]), mtInformation, [mbOK], 0);
+  MessageDlg(Format(MsgMsgPacked, [eResource.Text, ExtractFileName(eWAD.Text)]), mtInformation, [mbOK], 0);
 end;
 
 procedure TPackMapForm.FormCreate(Sender: TObject);
 begin
-  SaveDialog.InitialDir := EditorDir;
+  SaveDialog.InitialDir := MapsDir;
 end;
 
 end.