aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2016-12-10 19:04:58 -0500
committerPaul Gilbert2016-12-10 19:04:58 -0500
commitf2f2f4c525fc9ff58a221e298ef045d78390f0c7 (patch)
treef4a83a2fb5c3bb3e6bccaaae16d1b9cbc1e16294
parentebad4af484a79110cd6c5c6a2689302502ace745 (diff)
downloadscummvm-rg350-f2f2f4c525fc9ff58a221e298ef045d78390f0c7.tar.gz
scummvm-rg350-f2f2f4c525fc9ff58a221e298ef045d78390f0c7.tar.bz2
scummvm-rg350-f2f2f4c525fc9ff58a221e298ef045d78390f0c7.zip
TITANIC: Renaming fields in CCellPointButton
-rw-r--r--engines/titanic/game/cell_point_button.cpp70
-rw-r--r--engines/titanic/game/cell_point_button.h22
2 files changed, 46 insertions, 46 deletions
diff --git a/engines/titanic/game/cell_point_button.cpp b/engines/titanic/game/cell_point_button.cpp
index 207dd73543..2afcf39f48 100644
--- a/engines/titanic/game/cell_point_button.cpp
+++ b/engines/titanic/game/cell_point_button.cpp
@@ -30,33 +30,33 @@ BEGIN_MESSAGE_MAP(CCellPointButton, CBackground)
END_MESSAGE_MAP()
CCellPointButton::CCellPointButton() : CBackground() {
- _fieldE0 = 0;
- _fieldE4 = 0;
- _fieldE8 = 0;
- _fieldEC = 0;
+ _unused1 = 0;
+ _unused2 = 0;
+ _unused3 = 0;
+ _unused4 = 0;
_regionNum = 0;
- _fieldF4 = 0;
- _fieldF8 = 0;
- _fieldFC = 0;
- _field100 = 0;
- _field104 = 0;
- _field108 = 1;
+ _unused5 = 0;
+ _unused6 = 0;
+ _unused7 = 0;
+ _unused8 = 0;
+ _unused9 = 0;
+ _unused10 = 1;
}
void CCellPointButton::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
- file->writeNumberLine(_fieldE0, indent);
- file->writeNumberLine(_fieldE4, indent);
- file->writeNumberLine(_fieldE8, indent);
- file->writeNumberLine(_fieldEC, indent);
+ file->writeNumberLine(_unused1, indent);
+ file->writeNumberLine(_unused2, indent);
+ file->writeNumberLine(_unused3, indent);
+ file->writeNumberLine(_unused4, indent);
file->writeNumberLine(_regionNum, indent);
- file->writeNumberLine(_fieldF4, indent);
- file->writeNumberLine(_fieldF8, indent);
- file->writeNumberLine(_fieldFC, indent);
- file->writeNumberLine(_field100, indent);
- file->writeNumberLine(_field104, indent);
- file->writeNumberLine(_field108, indent);
- file->writeQuotedLine(_string3, indent);
+ file->writeNumberLine(_unused5, indent);
+ file->writeNumberLine(_unused6, indent);
+ file->writeNumberLine(_unused7, indent);
+ file->writeNumberLine(_unused8, indent);
+ file->writeNumberLine(_unused9, indent);
+ file->writeNumberLine(_unused10, indent);
+ file->writeQuotedLine(_npcName, indent);
file->writeNumberLine(_dialNum, indent);
CBackground::save(file, indent);
@@ -64,18 +64,18 @@ void CCellPointButton::save(SimpleFile *file, int indent) {
void CCellPointButton::load(SimpleFile *file) {
file->readNumber();
- _fieldE0 = file->readNumber();
- _fieldE4 = file->readNumber();
- _fieldE8 = file->readNumber();
- _fieldEC = file->readNumber();
+ _unused1 = file->readNumber();
+ _unused2 = file->readNumber();
+ _unused3 = file->readNumber();
+ _unused4 = file->readNumber();
_regionNum = file->readNumber();
- _fieldF4 = file->readNumber();
- _fieldF8 = file->readNumber();
- _fieldFC = file->readNumber();
- _field100 = file->readNumber();
- _field104 = file->readNumber();
- _field108 = file->readNumber();
- _string3 = file->readString();
+ _unused5 = file->readNumber();
+ _unused6 = file->readNumber();
+ _unused7 = file->readNumber();
+ _unused8 = file->readNumber();
+ _unused9 = file->readNumber();
+ _unused10 = file->readNumber();
+ _npcName = file->readString();
_dialNum = file->readNumber();
CBackground::load(file);
@@ -83,20 +83,20 @@ void CCellPointButton::load(SimpleFile *file) {
bool CCellPointButton::MouseButtonDownMsg(CMouseButtonDownMsg *msg) {
if (getRandomNumber(2) == 0) {
- CParrotSpeakMsg speakMsg("Cellpoints", _string3);
+ CParrotSpeakMsg speakMsg("Cellpoints", _npcName);
speakMsg.execute("PerchedParrot");
}
playMovie(0);
_regionNum = _regionNum ? 0 : 1;
playSound("z#425.wav");
- talkSetDialRegion(_string3, _dialNum, _regionNum);
+ talkSetDialRegion(_npcName, _dialNum, _regionNum);
return true;
}
bool CCellPointButton::EnterViewMsg(CEnterViewMsg *msg) {
- _regionNum = talkGetDialRegion(_string3, _dialNum);
+ _regionNum = talkGetDialRegion(_npcName, _dialNum);
return true;
}
diff --git a/engines/titanic/game/cell_point_button.h b/engines/titanic/game/cell_point_button.h
index 33f58cbb83..bee73441a8 100644
--- a/engines/titanic/game/cell_point_button.h
+++ b/engines/titanic/game/cell_point_button.h
@@ -32,18 +32,18 @@ class CCellPointButton : public CBackground {
bool MouseButtonDownMsg(CMouseButtonDownMsg *msg);
bool EnterViewMsg(CEnterViewMsg *msg);
public:
- int _fieldE0;
- int _fieldE4;
- int _fieldE8;
- int _fieldEC;
+ int _unused1;
+ int _unused2;
+ int _unused3;
+ int _unused4;
int _regionNum;
- int _fieldF4;
- int _fieldF8;
- int _fieldFC;
- int _field100;
- int _field104;
- int _field108;
- CString _string3;
+ int _unused5;
+ int _unused6;
+ int _unused7;
+ int _unused8;
+ int _unused9;
+ int _unused10;
+ CString _npcName;
int _dialNum;
public:
CLASSDEF;