mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not load title screen by default 

There may be crashes if something fails to load or initialise without an explicit fallback to show the title screen. These will need to be fixed when found.
This commit is contained in:
Ted John 2016-10-03 19:06:13 +01:00
parent 862b715003
commit 9359379d29
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/openrct2.c
View File

@ -283,13 +283,16 @@ void openrct2_launch()
switch (gOpenRCT2StartupAction) {
case STARTUP_ACTION_INTRO:
gIntroState = INTRO_STATE_PUBLISHER_BEGIN;
title_load();
break;
case STARTUP_ACTION_TITLE:
gScreenFlags = SCREEN_FLAGS_TITLE_DEMO;
title_load();
break;
case STARTUP_ACTION_OPEN:
assert(gOpenRCT2StartupActionPath != NULL);
if (!rct2_open_file(gOpenRCT2StartupActionPath)) {
fprintf(stderr, "Failed to load '%s'", gOpenRCT2StartupActionPath);
title_load();
break;
}
@ -315,7 +318,9 @@ void openrct2_launch()
if (strlen(gOpenRCT2StartupActionPath) == 0) {
editor_load();
} else {
editor_load_landscape(gOpenRCT2StartupActionPath);
if (!editor_load_landscape(gOpenRCT2StartupActionPath)) {
title_load();
}
}
break;
}

4
src/rct2.c
View File

@ -192,10 +192,6 @@ bool rct2_init()
window_guest_list_init_vars_b();
window_staff_list_init_vars();
if (!gOpenRCT2Headless) {
title_load();
}
log_verbose("initialising game finished");
return true;
}