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

dreammaster dreammaster at scummvm.org
Mon Sep 4 05:36:53 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:
f36f3942ea TITANIC: Fix Doorbot disappearing on loading prologue elevator savegame


Commit: f36f3942ea1e8109ded3d36bb50af2ec79f64016
    https://github.com/scummvm/scummvm/commit/f36f3942ea1e8109ded3d36bb50af2ec79f64016
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-09-03T23:36:47-04:00

Commit Message:
TITANIC: Fix Doorbot disappearing on loading prologue elevator savegame

Changed paths:
    engines/titanic/npcs/doorbot.cpp


diff --git a/engines/titanic/npcs/doorbot.cpp b/engines/titanic/npcs/doorbot.cpp
index 94c5e2c..8ee1e32 100644
--- a/engines/titanic/npcs/doorbot.cpp
+++ b/engines/titanic/npcs/doorbot.cpp
@@ -554,7 +554,7 @@ bool CDoorbot::TextInputMsg(CTextInputMsg *msg) {
 bool CDoorbot::EnterViewMsg(CEnterViewMsg *msg) {
 	if ((_npcFlags & NPCFLAG_DOORBOT_INTRO) && _introMovieNum == 7)
 		playClip("SE Move And Turn", MOVIE_NOTIFY_OBJECT);
-	else if (msg->_newView == getParent() && getPetControl()->canSummonBot("DoorBot")) {
+	else if (!compareRoomNameTo("ServiceElevator") && msg->_newView == getParent() && getPetControl()->canSummonBot("DoorBot")) {
 		// WORKAROUND: Calling bot in front of doors and then going through them
 		// can leave it in the view. Detect this and properly remove him when
 		// the player returns to that view





More information about the Scummvm-git-logs mailing list