libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Refactored CMaitreD static to instance field

Browse Source
This commit is contained in:
Paul Gilbert 2017-02-17 23:05:36 -05:00
parent 8dc3b4a0ca
commit 086e89bf7d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/titanic/npcs/maitre_d.cpp
View File

@ -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;

3
engines/titanic/npcs/maitre_d.h
View File

@ -40,8 +40,6 @@ class CMaitreD : public CTrueTalkNPC {
bool LoadSuccessMsg(CLoadSuccessMsg *msg);
bool TextInputMsg(CTextInputMsg *msg);
bool TriggerNPCEvent(CTriggerNPCEvent *msg);
private:
static int _v1;
private:
int _unused5;
CString _priorMusicName;
@ -52,6 +50,7 @@ private:
bool _unused6;
bool _savedFightFlag;
int _timerId;
bool _defeated;
public:
CLASSDEF;
CMaitreD();