diff options
| author | Paul Gilbert | 2016-12-23 11:42:49 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-24 18:23:34 -0500 |
| commit | cbdd5506e3fabfd29b0d88031f523117aa7b665a (patch) | |
| tree | aa12cd67faafc77087f30d8d59433b6c7d27b155 /engines/titanic/npcs/bilge_succubus.cpp | |
| parent | 4c1da0fc223fc1b6e6bf22f043e1a18fb51b40ab (diff) | |
| download | scummvm-rg350-cbdd5506e3fabfd29b0d88031f523117aa7b665a.tar.gz scummvm-rg350-cbdd5506e3fabfd29b0d88031f523117aa7b665a.tar.bz2 scummvm-rg350-cbdd5506e3fabfd29b0d88031f523117aa7b665a.zip | |
TITANIC: Renaming off frame fields in CSuccUBus
Diffstat (limited to 'engines/titanic/npcs/bilge_succubus.cpp')
| -rw-r--r-- | engines/titanic/npcs/bilge_succubus.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index d0a5dc17ae..b86d24bccf 100644 --- a/engines/titanic/npcs/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -182,13 +182,13 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { CPetControl *pet = getPetControl(); if (msg->_endFrame == _endFrame12) { - if (_startFrame10 >= 0) + if (_offStartFrame >= 0) playSound("z#27.wav"); - } else if (msg->_endFrame == _endFrame10) { + } else if (msg->_endFrame == _offEndFrame) { if (_startFrame11 >= 0) playSound("z#30.wav"); } else { - if (_endFrame9 == _endFrame10 && pet) { + if (_onEndFrame == _offEndFrame && pet) { if (_v2) { startTalking(this, getRandomNumber(1) ? 230062 : 230063); } else if (!findMail(pet->getRoomFlags())) { @@ -397,7 +397,7 @@ bool CBilgeSuccUBus::LeaveViewMsg(CLeaveViewMsg *msg) { if (_enabled) { _enabled = false; - if (_startFrame10 >= 0) + if (_offStartFrame >= 0) playSound("z#27.wav"); } @@ -419,8 +419,8 @@ bool CBilgeSuccUBus::TurnOn(CTurnOn *msg) { CPetControl *pet = getPetControl(); if (pet) { - if (_startFrame9 >= 0) { - playMovie(_startFrame9, _endFrame9, MOVIE_NOTIFY_OBJECT); + if (_onStartFrame >= 0) { + playMovie(_onStartFrame, _onEndFrame, MOVIE_NOTIFY_OBJECT); playSound("z#26.wav"); } @@ -452,8 +452,8 @@ bool CBilgeSuccUBus::TurnOff(CTurnOff *msg) { _soundHandle = -1; } - if (_startFrame10 >= 0) - playMovie(_startFrame10, _endFrame10, MOVIE_NOTIFY_OBJECT); + if (_offStartFrame >= 0) + playMovie(_offStartFrame, _offEndFrame, MOVIE_NOTIFY_OBJECT); _enabled = false; performAction(true); |