[Scummvm-git-logs] scummvm master -> 807fecf0f2077885daf4996dce8005f030a7c60a
dreammaster
dreammaster at scummvm.org
Sun Jul 23 16:03:07 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:
807fecf0f2 TITANIC: Add missing break lines to switch statements
Commit: 807fecf0f2077885daf4996dce8005f030a7c60a
https://github.com/scummvm/scummvm/commit/807fecf0f2077885daf4996dce8005f030a7c60a
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-23T10:01:16-04:00
Commit Message:
TITANIC: Add missing break lines to switch statements
Thanks to bgK for providing a gcc output
Changed paths:
engines/titanic/npcs/deskbot.cpp
engines/titanic/true_talk/barbot_script.cpp
engines/titanic/true_talk/bellbot_script.cpp
engines/titanic/true_talk/deskbot_script.cpp
engines/titanic/true_talk/doorbot_script.cpp
engines/titanic/true_talk/maitred_script.cpp
engines/titanic/true_talk/succubus_script.cpp
diff --git a/engines/titanic/npcs/deskbot.cpp b/engines/titanic/npcs/deskbot.cpp
index 2b88160..dd3c972 100644
--- a/engines/titanic/npcs/deskbot.cpp
+++ b/engines/titanic/npcs/deskbot.cpp
@@ -287,6 +287,7 @@ bool CDeskbot::TrueTalkNotifySpeechEndedMsg(CTrueTalkNotifySpeechEndedMsg *msg)
case 41789:
_npcFlags |= NPCFLAG_MOVE_FINISH;
turnOff.execute(this);
+ break;
case 41686:
_npcFlags |= NPCFLAG_MOVE_LEFT;
diff --git a/engines/titanic/true_talk/barbot_script.cpp b/engines/titanic/true_talk/barbot_script.cpp
index 627df6f..be1c73b 100644
--- a/engines/titanic/true_talk/barbot_script.cpp
+++ b/engines/titanic/true_talk/barbot_script.cpp
@@ -1027,6 +1027,7 @@ int BarbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScrip
case 1:
if (getValue(4) != 3)
id = 250738;
+ break;
case 2:
if (getValue(4) != 0)
id = 250738;
diff --git a/engines/titanic/true_talk/bellbot_script.cpp b/engines/titanic/true_talk/bellbot_script.cpp
index 8e5633b..7496bd5 100644
--- a/engines/titanic/true_talk/bellbot_script.cpp
+++ b/engines/titanic/true_talk/bellbot_script.cpp
@@ -930,6 +930,7 @@ int BellbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
addResponse(getDialogueId(200349));
applyFlag = true;
}
+ break;
case 15:
if (sentence->_category == 6) {
diff --git a/engines/titanic/true_talk/deskbot_script.cpp b/engines/titanic/true_talk/deskbot_script.cpp
index 6aa8ffd..8e24121 100644
--- a/engines/titanic/true_talk/deskbot_script.cpp
+++ b/engines/titanic/true_talk/deskbot_script.cpp
@@ -1116,6 +1116,7 @@ int DeskbotScript::preprocess(const TTroomScript *roomScript, const TTsentence *
applyFlag = true;
stateFlag = false;
}
+ break;
case 78:
// "Do you have a reservation?"
diff --git a/engines/titanic/true_talk/doorbot_script.cpp b/engines/titanic/true_talk/doorbot_script.cpp
index 4fcf329..0323e3d 100644
--- a/engines/titanic/true_talk/doorbot_script.cpp
+++ b/engines/titanic/true_talk/doorbot_script.cpp
@@ -775,6 +775,7 @@ int DoorbotScript::doSentenceEntry(int val1, const int *srcIdP, const TTroomScri
case 5:
if (getValue(1) == 3)
return 1;
+ break;
case 6:
if (getRoom54(132))
return 1;
diff --git a/engines/titanic/true_talk/maitred_script.cpp b/engines/titanic/true_talk/maitred_script.cpp
index 2ea69d4..26adb47 100644
--- a/engines/titanic/true_talk/maitred_script.cpp
+++ b/engines/titanic/true_talk/maitred_script.cpp
@@ -954,6 +954,7 @@ int MaitreDScript::preprocess(const TTroomScript *roomScript, const TTsentence *
addResponse(getDialogueId(260251));
applyFlag = true;
}
+ break;
case 25:
if ((sentence->localWord("open") && sentence->localWord("it"))
diff --git a/engines/titanic/true_talk/succubus_script.cpp b/engines/titanic/true_talk/succubus_script.cpp
index 29a085d..51c6b4a 100644
--- a/engines/titanic/true_talk/succubus_script.cpp
+++ b/engines/titanic/true_talk/succubus_script.cpp
@@ -50,6 +50,7 @@ int SuccUBusScript::chooseResponse(const TTroomScript *roomScript, const TTsente
case MKTAG('S', 'L', 'O', 'W'):
case MKTAG('T', 'H', 'R', 'T'):
dialogueId = 70021;
+ break;
case MKTAG('S', 'U', 'C', '1'):
dialogueId = getDialogueId(230009);
More information about the Scummvm-git-logs
mailing list