diff options
author | Paul Gilbert | 2016-08-22 19:25:36 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-08-22 19:25:36 -0400 |
commit | 65bc8cb83c01cc1e7e6c8c093b8f42080800718d (patch) | |
tree | 2b53d3e66b85ea775ab5131f2971764d93232183 /engines/titanic/npcs | |
parent | f238ed18ec24debf7f1b8713abf1ce3ebbeeaec3 (diff) | |
download | scummvm-rg350-65bc8cb83c01cc1e7e6c8c093b8f42080800718d.tar.gz scummvm-rg350-65bc8cb83c01cc1e7e6c8c093b8f42080800718d.tar.bz2 scummvm-rg350-65bc8cb83c01cc1e7e6c8c093b8f42080800718d.zip |
TITANIC: Implemented more game classes
Diffstat (limited to 'engines/titanic/npcs')
-rw-r--r-- | engines/titanic/npcs/liftbot.cpp | 2 | ||||
-rw-r--r-- | engines/titanic/npcs/parrot.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/npcs/liftbot.cpp b/engines/titanic/npcs/liftbot.cpp index 3d6321bfb5..272617ee62 100644 --- a/engines/titanic/npcs/liftbot.cpp +++ b/engines/titanic/npcs/liftbot.cpp @@ -123,7 +123,7 @@ bool CLiftBot::TurnOff(CTurnOff *msg) { bool CLiftBot::TurnOn(CTurnOn *msg) { _enabled = true; if (!_flag) { - if (compareTo("LiftBotTalking", 0)) { + if (isEquals("LiftBotTalking")) { endTalking(this, MOVIE_REPEAT, findView()); petSetArea(PET_CONVERSATION); _flag = true; diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index 3ea9bc0625..62b070efa4 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -421,7 +421,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) { // Check for rooms not to speak in for (const char *const *s = &ROOM_NAMES[0]; *s; ++s) { - if (compareTo(*s)) + if (isEquals(*s)) return true; } @@ -588,7 +588,7 @@ bool CParrot::FrameMsg(CFrameMsg *msg) { } } - bool chickenFlag = dragObject && dragObject->compareTo("Chicken"); + bool chickenFlag = dragObject && dragObject->isEquals("Chicken"); if (_npcFlags & NPCFLAG_1000000) { if (!chickenFlag || pt.x > 70 || pt.y < 90 || pt.y > 280) { |