index cdbe1056f9fde71dd1a11c5d2bfd53dac216faff..a8ad07a7eecc8b9120c3e4d9d6f7512b71c793d9 100644 (file)
--- a/src/editor/f_packmap.pas
+++ b/src/editor/f_packmap.pas
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}
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;
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;
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();
procedure TPackMapForm.FormCreate(Sender: TObject);
begin
- SaveDialog.InitialDir := EditorDir;
+ SaveDialog.InitialDir := MapsDir;
end;
end.