Merge pull request #1883 from Gymnasiast/fix-1870

Check if the game is in title sequence mode before loading it, fixes #1870
This commit is contained in:
Ted John 2015-09-03 12:17:45 +01:00
commit e6f1b6cd38
1 changed files with 11 additions and 4 deletions

View File

@ -716,8 +716,11 @@ bool title_refresh_sequence()
_scriptWaitCounter = 0;
gTitleScriptCommand = -1;
gTitleScriptSave = 0xFF;
title_update_showcase();
gfx_invalidate_screen();
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) == SCREEN_FLAGS_TITLE_DEMO) {
title_update_showcase();
gfx_invalidate_screen();
}
return true;
}
@ -735,8 +738,12 @@ bool title_refresh_sequence()
gCurrentPreviewTitleSequence = 0;
window_invalidate_by_class(WC_OPTIONS);
window_invalidate_by_class(WC_TITLE_EDITOR);
title_update_showcase();
gfx_invalidate_screen();
if (RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_FLAGS, uint8) == SCREEN_FLAGS_TITLE_DEMO) {
title_update_showcase();
gfx_invalidate_screen();
}
return false;
}