diff options
| author | Paul Gilbert | 2017-01-17 22:40:57 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-17 22:40:57 -0500 |
| commit | 63c3df22f01d80f383ceb5376be3ffac4838d4eb (patch) | |
| tree | bb997c144db5c61124a3f8f38ae57e30d978d022 /engines/titanic/npcs/parrot.cpp | |
| parent | 7ede6d585d5c93fa97855366adf7e44311a6f173 (diff) | |
| download | scummvm-rg350-63c3df22f01d80f383ceb5376be3ffac4838d4eb.tar.gz scummvm-rg350-63c3df22f01d80f383ceb5376be3ffac4838d4eb.tar.bz2 scummvm-rg350-63c3df22f01d80f383ceb5376be3ffac4838d4eb.zip | |
TITANIC: Handle -1 frameNumber in AVISurface::addEvent like original
Diffstat (limited to 'engines/titanic/npcs/parrot.cpp')
| -rw-r--r-- | engines/titanic/npcs/parrot.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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)); |