aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorPaul Gilbert2017-07-31 19:58:02 -0400
committerPaul Gilbert2017-07-31 19:58:02 -0400
commit329e9f11333aa3597f4988f35378adf52f7d5c42 (patch)
tree754d022447cef0fbb756ea72cf825654edda19d7 /engines
parent6f500030734a684c42382f10d0eb00314d3bdfc8 (diff)
downloadscummvm-rg350-329e9f11333aa3597f4988f35378adf52f7d5c42.tar.gz
scummvm-rg350-329e9f11333aa3597f4988f35378adf52f7d5c42.tar.bz2
scummvm-rg350-329e9f11333aa3597f4988f35378adf52f7d5c42.zip
TITANIC: Don't have bots appear in Embarkation SuccUBus or Deskbot desk
Diffstat (limited to 'engines')
-rw-r--r--engines/titanic/game/idle_summoner.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/titanic/game/idle_summoner.cpp b/engines/titanic/game/idle_summoner.cpp
index 28a73da020..d67c55f157 100644
--- a/engines/titanic/game/idle_summoner.cpp
+++ b/engines/titanic/game/idle_summoner.cpp
@@ -76,9 +76,17 @@ bool CIdleSummoner::TimerMsg(CTimerMsg *msg) {
uint nodesCtr = getNodeChangedCtr();
if (msg->_actionVal == 1 && !petDoorOrBellbotPresent()
&& nodesCtr > 0 && nodesCtr != _oldNodesCtr) {
+
+ // They can only appear in the Top of the Well and the Embarkation Lobby
if (!compareRoomNameTo("TopOfWell") && !compareRoomNameTo("EmbLobby"))
return true;
+ // WORKAROUND: To benefit the players, don't allow the bots to turn up
+ // when at the Embarkation SuccUBus or in front of the Deskbot's desk
+ CString fullName = getFullViewName();
+ if (fullName == "EmbLobby.Node 2.W" || fullName == "EmbLobby.Node 4.E")
+ return true;
+
int region = talkGetDialRegion("BellBot", 1);
uint delay = region == 1 ? 15000 : 120000;
uint enterTicks = MAX(getNodeEnterTicks(), _ticks);