diff options
author | Paul Gilbert | 2017-02-17 23:05:36 -0500 |
---|---|---|
committer | Paul Gilbert | 2017-02-17 23:05:36 -0500 |
commit | 086e89bf7d1d2305613711f23018cf933a45add6 (patch) | |
tree | 65d54fda665c0b65ec0c9d413aaae9d704cb9b0a /engines/titanic/npcs | |
parent | 8dc3b4a0cacb28d555fed0cc43d3c75a8bb6ab05 (diff) | |
download | scummvm-rg350-086e89bf7d1d2305613711f23018cf933a45add6.tar.gz scummvm-rg350-086e89bf7d1d2305613711f23018cf933a45add6.tar.bz2 scummvm-rg350-086e89bf7d1d2305613711f23018cf933a45add6.zip |
TITANIC: Refactored CMaitreD static to instance field
Diffstat (limited to 'engines/titanic/npcs')
-rw-r--r-- | engines/titanic/npcs/maitre_d.cpp | 11 | ||||
-rw-r--r-- | engines/titanic/npcs/maitre_d.h | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/engines/titanic/npcs/maitre_d.cpp b/engines/titanic/npcs/maitre_d.cpp index 99c874752e..b7634e682a 100644 --- a/engines/titanic/npcs/maitre_d.cpp +++ b/engines/titanic/npcs/maitre_d.cpp @@ -40,11 +40,10 @@ BEGIN_MESSAGE_MAP(CMaitreD, CTrueTalkNPC) ON_MESSAGE(TriggerNPCEvent) END_MESSAGE_MAP() -int CMaitreD::_v1; - CMaitreD::CMaitreD() : CTrueTalkNPC(), _priorMusicName("z#40.wav"), _musicName("z#40.wav"), _unused5(0), _hasMusic(true), - _musicSet(false), _fightFlag(false), _unused6(true), _savedFightFlag(false), _timerId(0) { + _musicSet(false), _fightFlag(false), _unused6(true), _savedFightFlag(false), + _timerId(0), _defeated(false) { } void CMaitreD::save(SimpleFile *file, int indent) { @@ -57,7 +56,7 @@ void CMaitreD::save(SimpleFile *file, int indent) { file->writeNumberLine(_fightFlag, indent); file->writeNumberLine(_unused6, indent); - file->writeNumberLine(_v1, indent); + file->writeNumberLine(_defeated, indent); file->writeNumberLine(_savedFightFlag, indent); file->writeNumberLine(_timerId, indent); @@ -74,7 +73,7 @@ void CMaitreD::load(SimpleFile *file) { _fightFlag = file->readNumber(); _unused6 = file->readNumber(); - _v1 = file->readNumber(); + _defeated = file->readNumber(); _savedFightFlag = file->readNumber(); _timerId = file->readNumber(); @@ -102,7 +101,7 @@ bool CMaitreD::TrueTalkTriggerActionMsg(CTrueTalkTriggerActionMsg *msg) { _timerId = 0; } else if (msg->_action == 10) { _fightFlag = false; - _v1 = 1; + _defeated = true; stopAnimTimer(_timerId); _timerId = 0; diff --git a/engines/titanic/npcs/maitre_d.h b/engines/titanic/npcs/maitre_d.h index 363ab321b9..6677a587a8 100644 --- a/engines/titanic/npcs/maitre_d.h +++ b/engines/titanic/npcs/maitre_d.h @@ -41,8 +41,6 @@ class CMaitreD : public CTrueTalkNPC { bool TextInputMsg(CTextInputMsg *msg); bool TriggerNPCEvent(CTriggerNPCEvent *msg); private: - static int _v1; -private: int _unused5; CString _priorMusicName; bool _hasMusic; @@ -52,6 +50,7 @@ private: bool _unused6; bool _savedFightFlag; int _timerId; + bool _defeated; public: CLASSDEF; CMaitreD(); |