[Scummvm-git-logs] scummvm master -> 400d8308c280eaf2706eaef8e5408c1a600de057

[dreammaster]

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:
400d8308c2 TITANIC: Implement display of initial copyright screen


Commit: 400d8308c280eaf2706eaef8e5408c1a600de057
    https://github.com/scummvm/scummvm/commit/400d8308c280eaf2706eaef8e5408c1a600de057
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-08-28T19:34:15-04:00

Commit Message:
TITANIC: Implement display of initial copyright screen

I've left it disabled for now, whilst the engine is still being worked on

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 486bc41..9a6437e 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -49,19 +49,24 @@ CMainGameWindow::CMainGameWindow(TitanicEngine *vm): _vm(vm),
 CMainGameWindow::~CMainGameWindow() {
 }
 
-bool CMainGameWindow::Create() {
-	Image image;
-	image.load("TITANIC");
-
-	// TODO: Stuff
-	return true;
-}
-
 void CMainGameWindow::applicationStarting() {
 	// Set the video mode
 	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) {
+		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();
 	if (saveSlot == -2)
diff --git a/engines/titanic/main_game_window.h b/engines/titanic/main_game_window.h
index 82e24e2..070f7df 100644
--- a/engines/titanic/main_game_window.h
+++ b/engines/titanic/main_game_window.h
@@ -104,11 +104,6 @@ public:
 	virtual void keyUp(Common::KeyState keyState);
 
 	/**
-	 * Creates the window
-	 */
-	bool Create();
-
-	/**
 	 * Called when the application starts
 	 */
 	void applicationStarting();