diff options
Diffstat (limited to 'engines/titanic/npcs/succubus.cpp')
| -rw-r--r-- | engines/titanic/npcs/succubus.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index ef681f64b8..522269b41b 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -47,7 +47,7 @@ BEGIN_MESSAGE_MAP(CSuccUBus, CTrueTalkNPC) END_MESSAGE_MAP() bool CSuccUBus::_isOn; -bool CSuccUBus::_style; +bool CSuccUBus::_motherBlocked; bool CSuccUBus::_enabled; CSuccUBus::CSuccUBus() : CTrueTalkNPC() { @@ -118,7 +118,7 @@ void CSuccUBus::save(SimpleFile *file, int indent) { file->writeNumberLine(_okEndFrame, indent); file->writeNumberLine(_flagsComparison, indent); - file->writeNumberLine(_style, indent); + file->writeNumberLine(_motherBlocked, indent); file->writeNumberLine(_afterReceiveStartFrame, indent); file->writeNumberLine(_afterReceiveEndFrame, indent); file->writeNumberLine(_trayOutStartFrame, indent); @@ -181,7 +181,7 @@ void CSuccUBus::load(SimpleFile *file) { _okEndFrame = file->readNumber(); _flagsComparison = (RoomFlagsComparison)file->readNumber(); - _style = file->readNumber(); + _motherBlocked = file->readNumber(); _afterReceiveStartFrame = file->readNumber(); _afterReceiveEndFrame = file->readNumber(); _trayOutStartFrame = file->readNumber(); @@ -385,9 +385,10 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { if (!pet) return true; - uint destRoomFlags = pet->getRoomFlags(); - CGameObject *mailObject = findMail(destRoomFlags); + uint srcRoomFlags = pet->getRoomFlags(); + CGameObject *mailObject = findMail(srcRoomFlags); if (!mailObject) { + // Nothing to send switch (getRandomNumber(2)) { case 0: startTalking(this, 70111, findView()); @@ -422,7 +423,7 @@ bool CSuccUBus::PETDeliverMsg(CPETDeliverMsg *msg) { if (_isFeathers) { // The feather has special handling to be rejected by the SuccUBus _sendLost = false; - sendMail(destRoomFlags, roomFlags); + sendMail(srcRoomFlags, roomFlags); pet->phonographAction(""); if (_okStartFrame >= 0) { @@ -570,7 +571,7 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { stopSound(_soundHandle); _soundHandle = -1; - switch (getRandomNumber(_style ? 7 : 5, &_priorRandomVal2)) { + switch (getRandomNumber(_motherBlocked ? 7 : 5, &_priorRandomVal2)) { case 2: startTalking(this, 230001, findView()); break; |