diff options
| author | Paul Gilbert | 2017-01-22 11:08:04 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-01-22 11:08:04 -0500 |
| commit | 54c6f27a60e0068385a94ebab321f305db65387c (patch) | |
| tree | 8e1f8e927eef321e569b2a43d2db01af39d209aa /engines/titanic/npcs | |
| parent | 92ec3a470a8df2fab6aae5caab5105a617a37818 (diff) | |
| download | scummvm-rg350-54c6f27a60e0068385a94ebab321f305db65387c.tar.gz scummvm-rg350-54c6f27a60e0068385a94ebab321f305db65387c.tar.bz2 scummvm-rg350-54c6f27a60e0068385a94ebab321f305db65387c.zip | |
TITANIC: Added RoomFlagsComparison enum
Diffstat (limited to 'engines/titanic/npcs')
| -rw-r--r-- | engines/titanic/npcs/bilge_succubus.cpp | 2 | ||||
| -rw-r--r-- | engines/titanic/npcs/succubus.cpp | 12 | ||||
| -rw-r--r-- | engines/titanic/npcs/succubus.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/titanic/npcs/bilge_succubus.cpp b/engines/titanic/npcs/bilge_succubus.cpp index 8fc13f3933..d5436ebc55 100644 --- a/engines/titanic/npcs/bilge_succubus.cpp +++ b/engines/titanic/npcs/bilge_succubus.cpp @@ -88,7 +88,7 @@ bool CBilgeSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) { } else { uint roomFlags = pet->getRoomFlags(); CGameObject *mailObject = findMailByFlags( - _v3 && compareRoomNameTo("Titania") ? 3 : _field140, + _v3 && compareRoomNameTo("Titania") ? RFC_TITANIA : _flagsComparison, roomFlags); if (mailObject) { diff --git a/engines/titanic/npcs/succubus.cpp b/engines/titanic/npcs/succubus.cpp index 1581e15d5f..de3c3793e1 100644 --- a/engines/titanic/npcs/succubus.cpp +++ b/engines/titanic/npcs/succubus.cpp @@ -67,7 +67,7 @@ CSuccUBus::CSuccUBus() : CTrueTalkNPC() { _offEndFrame = 27; _okStartFrame = 40; _okEndFrame = 68; - _field140 = 1; + _flagsComparison = RFC_LOCATION; _mailP = nullptr; _afterReceiveStartFrame = 0; _afterReceiveEndFrame = 0; @@ -118,7 +118,7 @@ void CSuccUBus::save(SimpleFile *file, int indent) { file->writeNumberLine(_offEndFrame, indent); file->writeNumberLine(_okStartFrame, indent); file->writeNumberLine(_okEndFrame, indent); - file->writeNumberLine(_field140, indent); + file->writeNumberLine(_flagsComparison, indent); file->writeNumberLine(_v2, indent); file->writeNumberLine(_afterReceiveStartFrame, indent); @@ -182,7 +182,7 @@ void CSuccUBus::load(SimpleFile *file) { _offEndFrame = file->readNumber(); _okStartFrame = file->readNumber(); _okEndFrame = file->readNumber(); - _field140 = file->readNumber(); + _flagsComparison = (RoomFlagsComparison)file->readNumber(); _v2 = file->readNumber(); _afterReceiveStartFrame = file->readNumber(); @@ -491,7 +491,7 @@ bool CSuccUBus::PETReceiveMsg(CPETReceiveMsg *msg) { } } else { CGameObject *mailObject = findMailByFlags( - _v3 && compareRoomNameTo("Titania") ? 3 : _field140, petRoomFlags); + _v3 && compareRoomNameTo("Titania") ? RFC_TITANIA : _flagsComparison, petRoomFlags); if (!mailObject) { // No mail for this SuccUBus if (getRandomNumber(1) == 0) { @@ -542,8 +542,8 @@ bool CSuccUBus::MovieEndMsg(CMovieEndMsg *msg) { if (pet && !mailExists(petRoomFlags)) { CGameObject *mailObject = _v3 && compareRoomNameTo("Titania") ? - findMailByFlags(3, petRoomFlags) : - findMailByFlags(_field140, petRoomFlags); + findMailByFlags(RFC_TITANIA, petRoomFlags) : + findMailByFlags(_flagsComparison, petRoomFlags); if (mailObject) { switch (getRandomNumber(4)) { diff --git a/engines/titanic/npcs/succubus.h b/engines/titanic/npcs/succubus.h index fe88d9b8c3..7c0edf711a 100644 --- a/engines/titanic/npcs/succubus.h +++ b/engines/titanic/npcs/succubus.h @@ -66,7 +66,7 @@ protected: int _offEndFrame; int _okStartFrame; int _okEndFrame; - int _field140; + RoomFlagsComparison _flagsComparison; CGameObject *_mailP; int _afterReceiveStartFrame; int _afterReceiveEndFrame; |