diff options
| author | Paul Gilbert | 2017-06-19 20:43:50 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-06-19 20:43:50 -0400 |
| commit | 6ccbdf78e566757a7fa71054a0298e18de1ea014 (patch) | |
| tree | 025e6fab048a18985a204e1933c80b30eb5a193c /engines | |
| parent | ec4550fae5f388fbd4d0a18c3eff545ec5c876f3 (diff) | |
| download | scummvm-rg350-6ccbdf78e566757a7fa71054a0298e18de1ea014.tar.gz scummvm-rg350-6ccbdf78e566757a7fa71054a0298e18de1ea014.tar.bz2 scummvm-rg350-6ccbdf78e566757a7fa71054a0298e18de1ea014.zip | |
TITANIC: Fix Bellbot walking off during checkin
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/titanic/npcs/bellbot.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/support/avi_surface.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/titanic/npcs/bellbot.cpp b/engines/titanic/npcs/bellbot.cpp index 327d24eb1e..270e237213 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 22ed166034..c42face861 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); |