From 63c3df22f01d80f383ceb5376be3ffac4838d4eb Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Tue, 17 Jan 2017 22:40:57 -0500 Subject: TITANIC: Handle -1 frameNumber in AVISurface::addEvent like original --- engines/titanic/npcs/parrot.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'engines/titanic/npcs') diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index b89d5c7abd..becd13bf08 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -642,8 +642,9 @@ bool CParrot::FrameMsg(CFrameMsg *msg) { break; } - if (action < 280266) { + if (action != 280266) { if (pt.x < 75) { + warning("***********************"); _npcFlags |= NPCFLAG_1000000; playClip("Walk Left Intro", MOVIE_STOP_PREVIOUS); playClip("Walk Left Loop", MOVIE_NOTIFY_OBJECT); @@ -684,7 +685,7 @@ bool CParrot::MovieFrameMsg(CMovieFrameMsg *msg) { _npcFlags &= ~NPCFLAG_800000; } - + warning("%d", msg->_frameNumber);//***DEBUG*** switch (msg->_frameNumber) { case 244: setPosition(Point(_bounds.left + 45, _bounds.top)); -- cgit v1.2.3