[Scummvm-git-logs] scummvm master -> 23f606a7a3140d29ea7f0f3ae2d02791ef283482

dreammaster dreammaster at scummvm.org
Sun Nov 6 21:50:16 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:
23f606a7a3 TITANIC: Workaround original game bug in fish response


Commit: 23f606a7a3140d29ea7f0f3ae2d02791ef283482
    https://github.com/scummvm/scummvm/commit/23f606a7a3140d29ea7f0f3ae2d02791ef283482
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-11-06T15:47:48-05:00

Commit Message:
TITANIC: Workaround original game bug in fish response

The original was meant to allow you to enter "fish" in response to
the Deskbot's fish question, but it didn't because fish was also
recognised as a common phrase for replacement during pre-processing

Changed paths:
    engines/titanic/true_talk/deskbot_script.cpp



diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp
index 0816a22..8daf056 100644
--- a/engines/titanic/true_talk/deskbot_script.cpp
+++ b/engines/titanic/true_talk/deskbot_script.cpp
@@ -1358,19 +1358,25 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 
 	case 92:
 	case 93:
+		// "Fish?"
 		if (sentence->_field2C == 11 || sentence->_field2C == 13) {
+			// Yes
 			addResponse(getDialogueId(241077));
 			addResponse(getDialogueId(241706));
 		} else if (sentence->_field2C == 12) {
+			// No
 			addAssignedRoom();
 			setState(0);
 			CTrueTalkManager::setFlags(CURRENT_STATE, 0);
 			return 2;
-		} else if (g_vm->_trueTalkManager->_quotes.find(sentence->_normalizedLine.c_str())
+		} else if (g_vm->_trueTalkManager->_quotes.find(sentence->_initialLine.c_str())
 				== MKTAG('F', 'I', 'S', 'H')) {
+			// WORKAROUND: Original passed _normalizedLine, but "fish" is one of the common
+			// phrases replaced with with alternative text "completelyrandom"
 			addResponse(getDialogueId(240877));
 			addResponse(getDialogueId(241706));
 		}else {
+			// All other responses
 			if (getRandomNumber(100) < 80 && sentence2C(sentence))
 				addResponse(getDialogueId(241707));
 





More information about the Scummvm-git-logs mailing list