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

dreammaster dreammaster at scummvm.org
Sun Sep 24 03:02:51 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:
e5cad39a58 TITANIC: DE: Updates for SuccUBusScript


Commit: e5cad39a58b8b3ce517c37eb36ffd7a3fc5522f6
    https://github.com/scummvm/scummvm/commit/e5cad39a58b8b3ce517c37eb36ffd7a3fc5522f6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-23T21:02:44-04:00

Commit Message:
TITANIC: DE: Updates for SuccUBusScript

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


diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp
index 9487584..34ae772 100644
--- a/engines/titanic/true_talk/succubus_script.cpp
+++ b/engines/titanic/true_talk/succubus_script.cpp
@@ -24,6 +24,7 @@
 #include "titanic/true_talk/succubus_script.h"
 #include "titanic/true_talk/true_talk_manager.h"
 #include "titanic/titanic.h"
+#include "titanic/translation.h"
 
 namespace Titanic {
 
@@ -171,15 +172,28 @@ int SuccUBusScript::process(const TTroomScript *roomScript, const TTsentence *se
 }
 
 ScriptChangedResult SuccUBusScript::scriptChanged(const TTroomScript *roomScript, uint id) {
-	if (id == 148)
-		CTrueTalkManager::setFlags(3, 1);
-	else if (id == 150)
-		CTrueTalkManager::setFlags(2, 1);
+	if (g_language == Common::EN_ANY) {
+		if (id == 148)
+			CTrueTalkManager::setFlags(3, 1);
+		else if (id == 150)
+			CTrueTalkManager::setFlags(2, 1);
+	} else {
+		if (id == 70211 || id == 230013) {
+			addResponse(getDialogueId(230163));
+			applyResponse();
+			return SCR_2;
+		} else if (id < 70211) {
+			if (id == 148)
+				CTrueTalkManager::setFlags(3, 1);
+			else if (id == 150)
+				CTrueTalkManager::setFlags(2, 1);
+		}
+	}
 
 	if (id >= 230000 && id <= 230245) {
 		addResponse(getDialogueId(id));
 		applyResponse();
-	} else if (id >= 70000 && id <= 70243) {
+	} else if (id >= 70000 && id <= (uint)TRANSLATE(70243, 70248)) {
 		addResponse(id);
 		applyResponse();
 	}





More information about the Scummvm-git-logs mailing list