diff options
| author | Paul Gilbert | 2017-01-22 14:57:30 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-22 14:57:30 -0500 |
| commit | fac26795b66eaeb5fd3c3adf946e8c6c216a85ff (patch) | |
| tree | 97f10d6457eb6bedbee6e1a391e89225d6a9b38e /engines/titanic/npcs/bilge_succubus.cpp | |
| parent | 5e61ea80c9f55e3d3cd5cf1d178037eacc35cef2 (diff) | |
| download | scummvm-rg350-fac26795b66eaeb5fd3c3adf946e8c6c216a85ff.tar.gz scummvm-rg350-fac26795b66eaeb5fd3c3adf946e8c6c216a85ff.tar.bz2 scummvm-rg350-fac26795b66eaeb5fd3c3adf946e8c6c216a85ff.zip | |
TITANIC: Added a SuccUBusAction enum
Diffstat (limited to 'engines/titanic/npcs/bilge_succubus.cpp')
| -rw-r--r-- | engines/titanic/npcs/bilge_succubus.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index d5436ebc55..8995d4b075 100644 --- a/engines/titanic/npcs/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -127,12 +127,12 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { _isChicken = mailObject->getName() == "Chicken"; _isFeathers = mailObject->getName() == "Feathers"; - _field158 = 0; + _sendAction = SA_SENT; if (_v2) { if (_isFeathers) { startTalking(this, 230022); - _field158 = 1; + _sendAction = SA_FEATHERS; if (_sendStartFrame >= 0) playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT); @@ -145,7 +145,7 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { } } else { startTalking(this, 230012); - _field158 = 2; + _sendAction = SA_EATEN; if (_sendStartFrame >= 0) playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); if (_receiveStartFrame >= 0) @@ -156,7 +156,7 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { } else { if (_isFeathers) { startTalking(this, 230022); - _field158 = 3; + _sendAction = SA_BILGE_FEATHERS; if (_sendStartFrame >= 0) playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); @@ -168,7 +168,7 @@ bool CBilgeSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { sendMail(petRoomFlags, roomFlags); startTalking(this, 230012); if (_sendStartFrame >= 0) { - _field158 = 4; + _sendAction = SA_BILGE_SENT; playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT | MOVIE_GAMESTATE); } } @@ -207,7 +207,7 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { } } else if (msg->_endFrame == _sendEndFrame) { - switch (_field158) { + switch (_sendAction) { case 1: stopSound(_soundHandle); _soundHandle = playSound("z#3.wav"); @@ -269,10 +269,10 @@ bool CBilgeSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { CBodyInBilgeRoomMsg bodyMsg; bodyMsg.execute("Service Elevator Entity"); decTransitions(); - _field158 = 0; + _sendAction = SA_SENT; } else { - _field158 = 0; + _sendAction = SA_SENT; } } @@ -346,7 +346,7 @@ bool CBilgeSuccUBus::SubAcceptCCarryMsg(CSubAcceptCCarryMsg *msg) { } if (_sendStartFrame >= 0) { - _field158 = 5; + _sendAction = SA_BILGE_EATEN; playMovie(_sendStartFrame, _sendEndFrame, MOVIE_NOTIFY_OBJECT); } |