[Scummvm-git-logs] scummvm master -> 388420c84a6615b3b0f825ae2d2e76c0448a699c

dreammaster dreammaster at scummvm.org
Fri Aug 11 02:03:11 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:
388420c84a TITANIC: Ignore Ctrl+C key until actually in-game


Commit: 388420c84a6615b3b0f825ae2d2e76c0448a699c
    https://github.com/scummvm/scummvm/commit/388420c84a6615b3b0f825ae2d2e76c0448a699c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-10T20:03:03-04:00

Commit Message:
TITANIC: Ignore Ctrl+C key until actually in-game

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 53539d8..053712d 100644
--- a/engines/titanic/main_game_window.cpp
+++ b/engines/titanic/main_game_window.cpp
@@ -336,8 +336,10 @@ void CMainGameWindow::keyDown(Common::KeyState keyState) {
 
 	} else if (keyState.keycode == Common::KEYCODE_c && (keyState.flags & Common::KBD_CTRL)) {
 		// Cheat action
-		CViewItem *newView = _project->parseView("Cheat Room.Node 1.Cheat Rooms View");
-		_gameManager->_gameState.changeView(newView, nullptr);
+		if (_project && g_vm->canLoadGameStateCurrently()) {
+			CViewItem *newView = _project->parseView("Cheat Room.Node 1.Cheat Rooms View");
+			_gameManager->_gameState.changeView(newView, nullptr);
+		}
 
 	} else if (_inputAllowed) {
 		_gameManager->_inputTranslator.keyDown(keyState);





More information about the Scummvm-git-logs mailing list