diff options
| -rw-r--r-- | engines/titanic/main_game_window.cpp | 10 | ||||
| -rw-r--r-- | engines/titanic/main_game_window.h | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp index 9d3defbac9..41ccd6d274 100644 --- a/engines/titanic/main_game_window.cpp +++ b/engines/titanic/main_game_window.cpp @@ -54,18 +54,16 @@ void CMainGameWindow::applicationStarting() { CScreenManager *screenManager = CScreenManager::setCurrent(); screenManager->setMode(640, 480, 16, 0, true); -#if 0 // Show the initial copyright & info screen for the game - if (gDebugLevel <= 0) { + if (!isLoadingFromLauncher()) { Image image; image.load("Bitmap/TITANIC"); _vm->_screen->blitFrom(image, Point( SCREEN_WIDTH / 2 - image.w / 2, SCREEN_HEIGHT / 2 - image.h / 2 - )); + )); _vm->_events->sleep(5000); } -#endif // Set up the game project, and get game slot int saveSlot = getSavegameSlot(); @@ -106,6 +104,10 @@ int CMainGameWindow::getSavegameSlot() { return selectSavegame(); } +bool CMainGameWindow::isLoadingFromLauncher() const { + return ConfMan.hasKey("save_slot"); +} + int CMainGameWindow::selectSavegame() { // If the user selected a savegame from the launcher, return it if (ConfMan.hasKey("save_slot")) diff --git a/engines/titanic/main_game_window.h b/engines/titanic/main_game_window.h index 52d4267c83..b29198caeb 100644 --- a/engines/titanic/main_game_window.h +++ b/engines/titanic/main_game_window.h @@ -44,6 +44,12 @@ private: uint32 _priorRightDownTime; private: /** + * Returns true if a savegame was selected to be loaded + * from the ScummVM launcher + */ + bool isLoadingFromLauncher() const; + + /** * Checks for the presence of any savegames and, if present, * lets the user pick one to resume */ |