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

[dreammaster]

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:
a851c3b185 TITANIC: Don't allow loading games when Bellbot is summoned


Commit: a851c3b1859e1408ed6c42b31d7f9976df795b4c
    https://github.com/scummvm/scummvm/commit/a851c3b1859e1408ed6c42b31d7f9976df795b4c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-08-04T22:57:36-04:00

Commit Message:
TITANIC: Don't allow loading games when Bellbot is summoned

Changed paths:
    engines/titanic/npcs/bellbot.cpp
    engines/titanic/npcs/callbot.cpp


diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 270e237..002af21 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -24,6 +24,7 @@
 #include "titanic/carry/carry.h"
 #include "titanic/core/room_item.h"
 #include "titanic/pet_control/pet_control.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
@@ -89,6 +90,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) {
 		_npcFlags &= ~NPCFLAG_MOVE_LOOP;
 	}
 
+	getGameManager()->_gameState.setMode(GSMODE_CUTSCENE);
 	playClip("Walk On", MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
 	movieEvent();
 	_npcFlags |= NPCFLAG_MOVING;
@@ -111,6 +113,7 @@ bool CBellBot::MovieEndMsg(CMovieEndMsg *msg) {
 	if (!(_npcFlags & NPCFLAG_MOVING)) {
 		CTrueTalkNPC::MovieEndMsg(msg);
 	} else if (clipExistsByEnd("Walk On", msg->_endFrame)) {
+		getGameManager()->_gameState.setMode(GSMODE_INTERACTIVE);
 		setPosition(Point(80, 10));
 		loadFrame(543);
 		_npcFlags |= NPCFLAG_START_IDLING;
diff --git a/engines/titanic/npcs/callbot.cpp b/engines/titanic/npcs/callbot.cpp
index 0979fa4..a5e8542 100644
--- a/engines/titanic/npcs/callbot.cpp
+++ b/engines/titanic/npcs/callbot.cpp
@@ -22,6 +22,7 @@
 
 #include "titanic/npcs/callbot.h"
 #include "titanic/core/room_item.h"
+#include "titanic/titanic.h"
 
 namespace Titanic {
 
@@ -59,10 +60,15 @@ bool CCallBot::EnterViewMsg(CEnterViewMsg *msg) {
 		CRoomItem *room = getRoom();
 
 		if (room) {
+			CGameState &gs = getGameManager()->_gameState;
+			gs.setMode(GSMODE_CUTSCENE);
+
 			CSummonBotQueryMsg queryMsg;
 			queryMsg._npcName = _npcName;
 			if (queryMsg.execute(room))
 				petOnSummonBot(_npcName, 0);
+
+			gs.setMode(GSMODE_INTERACTIVE);
 		}
 
 		_enabled = false;