[Scummvm-cvs-logs] scummvm master -> 6dd6e555133dfee1fa5647bfc9ba5cabc94a5ed9

dreammaster dreammaster at scummvm.org
Mon Mar 9 02:16:36 CET 2015


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:
6dd6e55513 MADS: Fix prior conversation list showing when crawling in vents


Commit: 6dd6e555133dfee1fa5647bfc9ba5cabc94a5ed9
    https://github.com/scummvm/scummvm/commit/6dd6e555133dfee1fa5647bfc9ba5cabc94a5ed9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-03-08T21:15:14-04:00

Commit Message:
MADS: Fix prior conversation list showing when crawling in vents

Changed paths:
    engines/mads/user_interface.cpp



diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp
index a53ab31..bcd4098 100644
--- a/engines/mads/user_interface.cpp
+++ b/engines/mads/user_interface.cpp
@@ -410,13 +410,21 @@ void UserInterface::setup(InputMode inputMode) {
 }
 
 void UserInterface::drawTextElements() {
-	if (_vm->_game->_screenObjects._inputMode) {
-		drawConversationList();
-	} else {
+	switch (_vm->_game->_screenObjects._inputMode) {
+	case kInputBuildingSentences:
 		// Draw the actions
 		drawActions();
 		drawInventoryList();
 		drawItemVocabList();
+		break;
+
+	case kInputConversation:
+		drawConversationList();
+		break;
+
+	case kInputLimitedSentences:
+	default:
+		break;
 	}
 }
 






More information about the Scummvm-git-logs mailing list