[Scummvm-git-logs] scummvm master -> 258015571ba58eb7c3281e2c833df83430c503c6

dreammaster dreammaster at scummvm.org
Thu Sep 7 01:37:24 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:
258015571b TITANIC: Add 'skip' response for Deskbot to skip entire checkin


Commit: 258015571ba58eb7c3281e2c833df83430c503c6
    https://github.com/scummvm/scummvm/commit/258015571ba58eb7c3281e2c833df83430c503c6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-06T19:37:06-04:00

Commit Message:
TITANIC: Add 'skip' response for Deskbot to skip entire checkin

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 d44cedf..3f65db9 100644
--- a/engines/titanic/true_talk/deskbot_script.cpp
+++ b/engines/titanic/true_talk/deskbot_script.cpp
@@ -1129,6 +1129,11 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
 			setDialRegion(1, 0);
 			addResponse(getDialogueId(241268));
 			addAskBreakfast();
+		} else if (sentence->contains("skip")) {
+			// WORKAROUND: Added 'skip' to allow skipping entire checkin
+			addAssignedRoom();
+			setState(0);
+			CTrueTalkManager::setFlags(CURRENT_STATE, 0);
 		} else {
 			// Player didn't say yes or no
 			addResponse(getDialogueId(240745));





More information about the Scummvm-git-logs mailing list