editor: Go into startup mode if the first scenario failed to load (#592)

Previously, the application would try to go into startup because the
editor was active, but then try to start a scenario because the startup
mode flag wasn't set. Check both the start flag and the editor flag in both
places.
Günther Brammer 2011-03-27 17:58:41 +02:00
parent 84411c3106
commit 69d161bdbb
1 changed files with 2 additions and 1 deletions

View File

@ -472,7 +472,7 @@ void C4Application::ApplyResolutionConstraints()
bool C4Application::PreInit()
{
// startup dialog: Only use if no next mission has been provided
bool fDoUseStartupDialog = UseStartupDialog && !*Game.ScenarioFilename;
bool fDoUseStartupDialog = (UseStartupDialog || isEditor) && !*Game.ScenarioFilename;
// Startup message board
if (!isEditor)
@ -649,6 +649,7 @@ void C4Application::GameTick()
Game.fObserve = false;
NextMission.Clear();
}
break;
case C4AS_Game:
// Game
if (Game.IsRunning)