diff options
| author | Paul Gilbert | 2016-12-25 16:42:44 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2016-12-25 16:42:44 -0500 |
| commit | 79e59fd80a4b5c61af0d96783d0d5e60592f07a7 (patch) | |
| tree | c5b3d1162aad47e65bc53d66823e5de851cfcf43 | |
| parent | ea7f98999e9ce3dd31cef73ae34a7cf8203cdedf (diff) | |
| download | scummvm-rg350-79e59fd80a4b5c61af0d96783d0d5e60592f07a7.tar.gz scummvm-rg350-79e59fd80a4b5c61af0d96783d0d5e60592f07a7.tar.bz2 scummvm-rg350-79e59fd80a4b5c61af0d96783d0d5e60592f07a7.zip | |
TITANIC: Renaming in CParrot class
| -rw-r--r-- | engines/titanic/npcs/parrot.cpp | 10 | ||||
| -rw-r--r-- | engines/titanic/npcs/parrot.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/npcs/parrot.cpp b/engines/titanic/npcs/parrot.cpp index ac33277849..65c05e81a1 100644 --- a/engines/titanic/npcs/parrot.cpp +++ b/engines/titanic/npcs/parrot.cpp @@ -56,7 +56,7 @@ CParrot::CParrot() : CTrueTalkNPC() { _string2 = "CarryParrot"; _field118 = 1; _field11C = 25; - _field120 = 0; + _lastSpeakTime = 0; _newXp = 73; _newXc = 58; _field12C = 0; @@ -126,7 +126,7 @@ void CParrot::save(SimpleFile *file, int indent) { file->writeQuotedLine(_string2, indent); file->writeNumberLine(_field118, indent); file->writeNumberLine(_field11C, indent); - file->writeNumberLine(_field120, indent); + file->writeNumberLine(_lastSpeakTime, indent); file->writeNumberLine(_newXp, indent); file->writeNumberLine(_newXc, indent); file->writeNumberLine(_field12C, indent); @@ -150,7 +150,7 @@ void CParrot::load(SimpleFile *file) { _string2 = file->readString(); _field118 = file->readNumber(); _field11C = file->readNumber(); - _field120 = file->readNumber(); + _lastSpeakTime = file->readNumber(); _newXp = file->readNumber(); _newXc = file->readNumber(); _field12C = file->readNumber(); @@ -426,7 +426,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) { } // Don't have the parrot speak too often - if ((getTicksCount() - _field120) < 20000 || _speechCounter) + if ((getTicksCount() - _lastSpeakTime) < 20000 || _speechCounter) return true; playSound("z#475.wav", 50); @@ -473,7 +473,7 @@ bool CParrot::ParrotSpeakMsg(CParrotSpeakMsg *msg) { } } - _field120 = getTicksCount(); + _lastSpeakTime = getTicksCount(); return true; } diff --git a/engines/titanic/npcs/parrot.h b/engines/titanic/npcs/parrot.h index 54b16deea7..66a199efc1 100644 --- a/engines/titanic/npcs/parrot.h +++ b/engines/titanic/npcs/parrot.h @@ -57,7 +57,7 @@ private: CString _string2; int _field118; int _field11C; - int _field120; + uint _lastSpeakTime; int _newXp; int _newXc; int _field12C; |