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

dreammaster dreammaster at scummvm.org
Wed Oct 4 03:17:57 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:
d0c20062ad TITANIC: Fix cursor when in MissiveOMat when Conversations tab active


Commit: d0c20062adda1b90b381a8302292671bc8fb9337
    https://github.com/scummvm/scummvm/commit/d0c20062adda1b90b381a8302292671bc8fb9337
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-03T21:17:53-04:00

Commit Message:
TITANIC: Fix cursor when in MissiveOMat when Conversations tab active

Changed paths:
    engines/titanic/game/missiveomat.cpp


diff --git a/engines/titanic/game/missiveomat.cpp b/engines/titanic/game/missiveomat.cpp
index e60f695..0c74787 100644
--- a/engines/titanic/game/missiveomat.cpp
+++ b/engines/titanic/game/missiveomat.cpp
@@ -145,7 +145,7 @@ bool CMissiveOMat::KeyCharMsg(CKeyCharMsg *msg) {
 			// Check whether a valid username and password has been entered
 			static const char *const PASSWORDS_EN[3] = { "other", "this", "that" };
 			static const char *const PASSWORDS_DE[3] = { "t'ok", "t'ik", "t'ak" };
-			static const char *const *pwds = g_vm->isGerman() ? PASSWORDS_DE : PASSWORDS_EN;
+			static const char *const *pwds = TRANSLATE(PASSWORDS_EN, PASSWORDS_DE);
 
 			bool validFlag = false;
 			if ((_username == "leovinus" && _password == pwds[0]) ||
@@ -336,6 +336,7 @@ bool CMissiveOMat::MissiveOMatActionMsg(CMissiveOMatActionMsg *msg) {
 		editMsg._mode = EDIT_BORDERS;
 		editMsg._param = 8;
 		editMsg.execute("MissiveOMat Login Control");
+		petHideCursor();
 		editMsg._mode = EDIT_SHOW_CURSOR;
 		editMsg.execute("MissiveOMat Login Control");
 





More information about the Scummvm-git-logs mailing list