[Scummvm-git-logs] scummvm master -> f11033df6547a2e384a4b92d36109a86cfd525cc

[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:
f11033df65 TITANIC: Fix drawing screen after loading game using in-game PET


Commit: f11033df6547a2e384a4b92d36109a86cfd525cc
    https://github.com/scummvm/scummvm/commit/f11033df6547a2e384a4b92d36109a86cfd525cc
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-07T21:56:03-05:00

Commit Message:
TITANIC: Fix drawing screen after loading game using in-game PET

Changed paths:
    engines/titanic/main_game_window.cpp



diff --git a/engines/titanic/main_game_window.cpp b/engines/titanic/main_game_window.cpp
index 4ee7154..6438929 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -150,6 +150,14 @@ void CMainGameWindow::draw() {
 		scrManager->clearSurface(SURFACE_BACKBUFFER, &_gameManager->_bounds);
 
 		switch (_gameManager->_gameState._mode) {
+		case GSMODE_PENDING_LOAD:
+			// Pending savegame to load
+			_gameManager->_gameState.setMode(GSMODE_INTERACTIVE);
+			_project->loadGame(_pendingLoadSlot);
+			_pendingLoadSlot = -1;
+
+			// Deliberate fall-through to draw loaded game
+
 		case GSMODE_INTERACTIVE:
 		case GSMODE_CUTSCENE:
 			if (_gameManager->_gameState._petActive)
@@ -165,12 +173,6 @@ void CMainGameWindow::draw() {
 			_vm->_filesManager->insertCD(scrManager);
 			break;
 
-		case GSMODE_PENDING_LOAD:
-			// Pending savegame to load
-			_gameManager->_gameState.setMode(GSMODE_INTERACTIVE);
-			_vm->_window->_project->loadGame(_pendingLoadSlot);
-			break;
-
 		default:
 			break;
 		}