[Scummvm-git-logs] scummvm master -> 329e9f11333aa3597f4988f35378adf52f7d5c42

dreammaster dreammaster at scummvm.org
Tue Aug 1 01:58: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:
329e9f1133 TITANIC: Don't have bots appear in Embarkation SuccUBus or Deskbot desk


Commit: 329e9f11333aa3597f4988f35378adf52f7d5c42
    https://github.com/scummvm/scummvm/commit/329e9f11333aa3597f4988f35378adf52f7d5c42
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-07-31T19:58:02-04:00

Commit Message:
TITANIC: Don't have bots appear in Embarkation SuccUBus or Deskbot desk

Changed paths:
    engines/titanic/game/idle_summoner.cpp


diff --git a/engines/titanic/game/idle_summoner.cpp b/engines/titanic/game/idle_summoner.cpp
index 28a73da..d67c55f 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);





More information about the Scummvm-git-logs mailing list