[Scummvm-git-logs] scummvm master -> 6ccbdf78e566757a7fa71054a0298e18de1ea014

[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:
6ccbdf78e5 TITANIC: Fix Bellbot walking off during checkin


Commit: 6ccbdf78e566757a7fa71054a0298e18de1ea014
    https://github.com/scummvm/scummvm/commit/6ccbdf78e566757a7fa71054a0298e18de1ea014
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-06-19T20:43:50-04:00

Commit Message:
TITANIC: Fix Bellbot walking off during checkin

Changed paths:
    engines/titanic/npcs/bellbot.cpp
    engines/titanic/support/avi_surface.cpp


diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp
index 327d24e..270e237 100644
--- a/engines/titanic/npcs/bellbot.cpp
+++ b/engines/titanic/npcs/bellbot.cpp
@@ -98,7 +98,7 @@ bool CBellBot::OnSummonBotMsg(COnSummonBotMsg *msg) {
 
 bool CBellBot::LeaveViewMsg(CLeaveViewMsg *msg) {
 	if (_npcFlags & NPCFLAG_MOVING) {
-		performAction(1);
+		performAction(true);
 		_npcFlags &= ~NPCFLAG_START_IDLING;
 		CDismissBotMsg dismissMsg;
 		dismissMsg.execute(this);
diff --git a/engines/titanic/support/avi_surface.cpp b/engines/titanic/support/avi_surface.cpp
index 22ed166..c42face 100644
--- a/engines/titanic/support/avi_surface.cpp
+++ b/engines/titanic/support/avi_surface.cpp
@@ -205,11 +205,9 @@ bool AVISurface::handleEvents(CMovieEventList &events) {
 	}
 
 	if (isPlaying()) {
-		if (newFrame != getFrame()) {
+		if (newFrame != getFrame())
 			// The frame has been changed, so move to new position
 			seekToFrame(newFrame);
-			return renderFrame();
-		}
 
 		// Get any events for the given position
 		info->getMovieFrame(events, newFrame);