[Scummvm-git-logs] scummvm master -> 1342a4532165233f4dc562e58b77fd02bc363a83
dreammaster
dreammaster at scummvm.org
Sat Jun 10 01:40:44 CEST 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1342a45321 TITANIC: Enable initial copyright screen
Commit: 1342a4532165233f4dc562e58b77fd02bc363a83
https://github.com/scummvm/scummvm/commit/1342a4532165233f4dc562e58b77fd02bc363a83
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-09T19:40:35-04:00
Commit Message:
TITANIC: Enable initial copyright screen
Changed paths:
engines/titanic/main_game_window.cpp
engines/titanic/main_game_window.h
diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index 9d3defb..41ccd6d 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 52d4267..b29198c 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
*/
More information about the Scummvm-git-logs
mailing list