diff --git a/src/editor/f_main.pas b/src/editor/f_main.pas
index ca323f69220c99e1b7d12e4918cea0edba16e6e7..e3c6288d2419f49a2b6d2f38fca31b5e1eec0da4 100644 (file)
--- a/src/editor/f_main.pas
+++ b/src/editor/f_main.pas
var
MainForm: TMainForm;
+ StartMap: String;
OpenedMap: String;
OpenedWAD: String;
end
else
begin // Внешний WAD
- FileName := EditorDir+'wads/'+aWAD;
+ FileName := WadsDir + DirectorySeparator + aWAD;
ResourceName := aWAD+':'+SectionName+'\'+aTex;
end;
begin
if MapTestProcess.Running = false then
begin
+ if MapTestProcess.ExitCode <> 0 then
+ Application.MessageBox(PChar(_lc[I_MSG_EXEC_ERROR]), 'FIXME', MB_OK or MB_ICONERROR);
SysUtils.DeleteFile(MapTestFile);
MapTestFile := '';
FreeAndNil(MapTestProcess);
end;
procedure TMainForm.OnIdle(Sender: TObject; var Done: Boolean);
+ var f: AnsiString;
begin
// FIXME: this is a shitty hack
if not gDataLoaded then
MainForm.FormResize(nil);
end;
Draw();
+ if StartMap <> '' then
+ begin
+ f := StartMap;
+ StartMap := '';
+ OpenMap(f, '');
+ end;
end;
procedure TMainForm.miMapPreviewClick(Sender: TObject);
end
else
begin
- MessageBox(0, 'FIXME', PChar(_lc[I_MSG_EXEC_ERROR]), MB_OK or MB_ICONERROR);
+ Application.MessageBox(PChar(_lc[I_MSG_EXEC_ERROR]), 'FIXME', MB_OK or MB_ICONERROR);
SysUtils.DeleteFile(newWAD);
proc.Free();
end;