X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Feditor%2Ff_packmap.pas;h=fbfe4735001a57e21e74bfefbefb5bf5ccb47d80;hb=c0428d85795e63600466f089c35e70bc66d9b5c2;hp=cdbe1056f9fde71dd1a11c5d2bfd53dac216faff;hpb=a140ef8433c5e5cdf3d2ec4a6343c5380535e200;p=d2df-editor.git diff --git a/src/editor/f_packmap.pas b/src/editor/f_packmap.pas index cdbe105..fbfe473 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} @@ -107,7 +107,6 @@ 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();