diff options
author | Paul Gilbert | 2016-10-28 20:19:35 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-10-28 20:19:35 -0400 |
commit | f7c7f11435c96781d02c8c44c29e9da08392eec2 (patch) | |
tree | b56fbe645b3f902a29310e847baf1c7007799cab /engines/titanic/npcs/parrot.cpp | |
parent | aee3599e6bc2fd2cf8cd627de7f607365302efa6 (diff) | |
download | scummvm-rg350-f7c7f11435c96781d02c8c44c29e9da08392eec2.tar.gz scummvm-rg350-f7c7f11435c96781d02c8c44c29e9da08392eec2.tar.bz2 scummvm-rg350-f7c7f11435c96781d02c8c44c29e9da08392eec2.zip |
TITANIC: Renames and adding debugging
Diffstat (limited to 'engines/titanic/npcs/parrot.cpp')
-rw-r--r-- | engines/titanic/npcs/parrot.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index 97a1944fef..7db0fbd0aa 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -202,7 +202,7 @@ bool CParrot::ActMsg(CActMsg *msg) { } bool CParrot::MouseButtonDownMsg(CMouseButtonDownMsg *msg) { - if (!(_npcFlags & NPCFLAG_2000000) && _field100 <= 0) { + if (!(_npcFlags & NPCFLAG_2000000) && _speechCounter == 0) { CTrueTalkTriggerActionMsg triggerMsg(280250, 280250, 1); triggerMsg.execute(this); } @@ -354,7 +354,7 @@ bool CParrot::EnterViewMsg(CEnterViewMsg *msg) { loadFrame(0); endTalking(this, true, findView()); - if (_field100 > 0) { + if (_speechCounter > 0) { playRandomClip(NAMES, MOVIE_NOTIFY_OBJECT); } else { startTalking(this, 280258, findView()); @@ -425,7 +425,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) { } // Don't have the parrot speak too often - if ((getTicksCount() - _field120) < 20000 || _field100) + if ((getTicksCount() - _field120) < 20000 || _speechCounter) return true; playSound("z#475.wav", 50); |