[Scummvm-git-logs] scummvm master -> 96c36d53984dc2047af5542a5378adeb8e42be7c

dreammaster dreammaster at scummvm.org
Tue Dec 27 03:10:29 CET 2016


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:
96c36d5398 TITANIC: Hide any active PET text cursor when loading a savegame


Commit: 96c36d53984dc2047af5542a5378adeb8e42be7c
    https://github.com/scummvm/scummvm/commit/96c36d53984dc2047af5542a5378adeb8e42be7c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-12-26T21:10:17-05:00

Commit Message:
TITANIC: Hide any active PET text cursor when loading a savegame

Changed paths:
    engines/titanic/core/project_item.cpp
    engines/titanic/support/screen_manager.cpp
    engines/titanic/support/screen_manager.h


diff --git a/engines/titanic/core/project_item.cpp b/engines/titanic/core/project_item.cpp
index f9c7dbd..1093a5c 100644
--- a/engines/titanic/core/project_item.cpp
+++ b/engines/titanic/core/project_item.cpp
@@ -309,6 +309,10 @@ void CProjectItem::saveData(SimpleFile *file, CTreeItem *item) const {
 void CProjectItem::preLoad() {
 	if (_gameManager)
 		_gameManager->preLoad();
+
+	CScreenManager *scrManager = CScreenManager::_currentScreenManagerPtr;
+	if (scrManager)
+		scrManager->preLoad();
 }
 
 void CProjectItem::postLoad() {
diff --git a/engines/titanic/support/screen_manager.cpp b/engines/titanic/support/screen_manager.cpp
index 553486d..cc9054e 100644
--- a/engines/titanic/support/screen_manager.cpp
+++ b/engines/titanic/support/screen_manager.cpp
@@ -73,6 +73,11 @@ int CScreenManager::setFontNumber(int fontNumber) {
 	return oldFontNumber;
 }
 
+void CScreenManager::preLoad() {
+	if (_textCursor)
+		_textCursor->hide();
+}
+
 /*------------------------------------------------------------------------*/
 
 OSScreenManager::OSScreenManager(TitanicEngine *vm): CScreenManager(vm),
diff --git a/engines/titanic/support/screen_manager.h b/engines/titanic/support/screen_manager.h
index a7c929f..7140001 100644
--- a/engines/titanic/support/screen_manager.h
+++ b/engines/titanic/support/screen_manager.h
@@ -228,6 +228,11 @@ public:
 	 * Set the current font number
 	 */
 	int setFontNumber(int fontNumber);
+
+	/**
+	 * Called when a game is about to be loaded
+	 */
+	void preLoad();
 };
 
 class OSScreenManager: CScreenManager {





More information about the Scummvm-git-logs mailing list