X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_packmap.pas;h=a8ad07a7eecc8b9120c3e4d9d6f7512b71c793d9;hb=2789c629b21057292614b015b9a03595bab89c2f;hp=cdbe1056f9fde71dd1a11c5d2bfd53dac216faff;hpb=a140ef8433c5e5cdf3d2ec4a6343c5380535e200;p=d2df-editor.git

diff --git a/src/editor/f_packmap.pas b/src/editor/f_packmap.pas
index cdbe105..a8ad07a 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}
 
@@ -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(_lc[I_MSG_WAD_ERROR], [ExtractFileName(filename)])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
+    Application.MessageBox(PChar(Format(_lc[I_MSG_RES_ERROR], [filename, section, resource])), PChar(_lc[I_MSG_ERROR]), MB_OK + MB_ICONERROR);
     Result := False
   end
 end;
 
 procedure TPackMapForm.bPackClick(Sender: TObject);
 var
-  WadFile: String;
   mr: TMapReader_1;
   mw: TMapWriter_1;
   data: Pointer;
@@ -133,15 +132,7 @@ begin
     Exit;
 
   if not cbAdd.Checked then
-  begin
-    (* Overwrite wad *)
-    if FileExists(eWAD.Text) then
-    begin
-      if FileExists(eWAD.Text + '.bak0') then
-        ASSERT(DeleteFile(eWAD.Text + '.bak0'));
-      ASSERT(RenameFile(eWAD.Text, eWAD.Text + '.bak0'))
-    end
-  end;
+    g_DeleteFile(eWAD.Text, '.bak0');
 
 // Читаем карту из памяти:
   mr := TMapReader_1.Create();
@@ -323,7 +314,7 @@ end;
 
 procedure TPackMapForm.FormCreate(Sender: TObject);
 begin
-  SaveDialog.InitialDir := EditorDir;
+  SaveDialog.InitialDir := MapsDir;
 end;
 
 end.