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

TITANIC: Rename light fields to more closely match original

Browse Source
This commit is contained in:
Paul Gilbert 2017-01-16 11:36:44 -05:00
parent 953e4e6d21
commit 3e2f084b41
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
engines/titanic/game/light.cpp
View File

@ -37,18 +37,18 @@ BEGIN_MESSAGE_MAP(CLight, CBackground)
ON_MESSAGE(EnterRoomMsg)
END_MESSAGE_MAP()
CLight::CLight() : CBackground(), _unused1(0), _upRight(false),
_upLeft(false), _downLeft(false), _downRight(false), _unused2(0),
CLight::CLight() : CBackground(), _unused1(0), _topRight(false),
_topLeft(false), _bottomLeft(false), _bottomRight(false), _unused2(0),
_unused3(0), _eyePresent(false) {
}
void CLight::save(SimpleFile *file, int indent) {
file->writeNumberLine(1, indent);
file->writeNumberLine(_unused1, indent);
file->writeNumberLine(_upRight, indent);
file->writeNumberLine(_upLeft, indent);
file->writeNumberLine(_downLeft, indent);
file->writeNumberLine(_downRight, indent);
file->writeNumberLine(_topRight, indent);
file->writeNumberLine(_topLeft, indent);
file->writeNumberLine(_bottomLeft, indent);
file->writeNumberLine(_bottomRight, indent);
file->writeNumberLine(_unused2, indent);
file->writeNumberLine(_unused3, indent);
file->writeNumberLine(_eyePresent, indent);
@ -59,10 +59,10 @@ void CLight::save(SimpleFile *file, int indent) {
void CLight::load(SimpleFile *file) {
file->readNumber();
_unused1 = file->readNumber();
_upRight = file->readNumber();
_upLeft = file->readNumber();
_downLeft = file->readNumber();
_downRight = file->readNumber();
_topRight = file->readNumber();
_topLeft = file->readNumber();
_bottomLeft = file->readNumber();
_bottomRight = file->readNumber();
_unused2 = file->readNumber();
_unused3 = file->readNumber();
_eyePresent = file->readNumber();
@ -76,8 +76,8 @@ bool CLight::TurnOff(CTurnOff *msg) {
}
bool CLight::LightsMsg(CLightsMsg *msg) {
if ((msg->_upLeft && _upLeft) || (msg->_downLeft && _downLeft)
|| (msg->_upRight && _upRight) || (msg->_downRight && _downRight)) {
if ((msg->_topLeft && _topLeft) || (msg->_bottomLeft && _bottomLeft)
|| (msg->_topRight && _topRight) || (msg->_bottomRight && _bottomRight)) {
setVisible(true);
} else {
setVisible(false);
@ -138,7 +138,7 @@ bool CLight::EnterRoomMsg(CEnterRoomMsg *msg) {
setVisible(true);
if (isEquals("6WTL")) {
CLightsMsg lightsMsg(1, 1, 1, 1);
CLightsMsg lightsMsg(true, true, true, true);
lightsMsg.execute("1stClassState", CLight::_type, MSGFLAG_SCAN);
bool flag = pet ? pet->isRoom59706() : false;

8
engines/titanic/game/light.h
View File

@ -40,10 +40,10 @@ class CLight : public CBackground {
bool EnterRoomMsg(CEnterRoomMsg *msg);
private:
int _unused1;
bool _upRight;
bool _upLeft;
bool _downLeft;
bool _downRight;
bool _topRight;
bool _topLeft;
bool _bottomLeft;
bool _bottomRight;
int _unused2;
int _unused3;
bool _eyePresent;

2
engines/titanic/game/television.cpp
View File

@ -288,7 +288,7 @@ bool CTelevision::LightsMsg(CLightsMsg *msg) {
if (pet)
flag = pet->isRoom59706();
if (msg->_upLeft || !flag)
if (msg->_topLeft || !flag)
_turnOn = true;
return true;

2
engines/titanic/messages/messages.h
View File

@ -280,7 +280,7 @@ MESSAGE2(CLeaveNodeMsg, CNodeItem *, oldNode, nullptr, CNodeItem *, newNode, nul
MESSAGE2(CLeaveRoomMsg, CRoomItem *, oldRoom, nullptr, CRoomItem *, newRoom, nullptr);
MESSAGE2(CLeaveViewMsg, CViewItem *, oldView, nullptr, CViewItem *, newView, nullptr);
MESSAGE1(CLemonFallsFromTreeMsg, Point, pt, Point());
MESSAGE4(CLightsMsg, bool, upRight, false, bool, upLeft, false, bool, downLeft, false, bool, downRight, false);
MESSAGE4(CLightsMsg, bool, topRight, false, bool, topLeft, false, bool, bottomLeft, false, bool, bottomRight, false);
MESSAGE1(CLoadSuccessMsg, int, ticks, 0);
MESSAGE1(CLockPhonographMsg, int, value, 0);
MESSAGE0(CMaitreDDefeatedMsg);