diff options
| author | Paul Gilbert | 2017-06-23 20:10:57 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2017-06-23 20:10:57 -0400 |
| commit | 89da989e52e0ee43accab9c40fa5320d20762dae (patch) | |
| tree | bb07ae7c79c5f88ca10eade06569a6c7809bfb18 | |
| parent | 925c5f2d33d57be79bda8270bbd2f69fa46ffd4d (diff) | |
| download | scummvm-rg350-89da989e52e0ee43accab9c40fa5320d20762dae.tar.gz scummvm-rg350-89da989e52e0ee43accab9c40fa5320d20762dae.tar.bz2 scummvm-rg350-89da989e52e0ee43accab9c40fa5320d20762dae.zip | |
TITANIC: Minor renamings for Television eye floor
| -rw-r--r-- | engines/titanic/game/television.cpp | 12 | ||||
| -rw-r--r-- | engines/titanic/game/television.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/titanic/game/television.cpp b/engines/titanic/game/television.cpp index ebcf15f2c0..1380b441d7 100644 --- a/engines/titanic/game/television.cpp +++ b/engines/titanic/game/television.cpp @@ -48,7 +48,7 @@ END_MESSAGE_MAP() int CTelevision::_seasonFrame; bool CTelevision::_turnOn; int CTelevision::_seasonUnused; -int CTelevision::_floorNum; +int CTelevision::_eyeFloorNum; bool CTelevision::_channel4Glyph; bool CTelevision::_eyeFlag; @@ -60,7 +60,7 @@ void CTelevision::init() { _seasonFrame = 531; _turnOn = true; _seasonUnused = 0; - _floorNum = 27; + _eyeFloorNum = 27; _channel4Glyph = true; _eyeFlag = true; } @@ -77,7 +77,7 @@ void CTelevision::save(SimpleFile *file, int indent) { file->writeNumberLine(_isOn, indent); file->writeNumberLine(_seasonUnused, indent); file->writeNumberLine(_unused, indent); - file->writeNumberLine(_floorNum, indent); + file->writeNumberLine(_eyeFloorNum, indent); file->writeNumberLine(_soundHandle, indent); file->writeNumberLine(_channel4Glyph, indent); file->writeNumberLine(_eyeFlag, indent); @@ -94,7 +94,7 @@ void CTelevision::load(SimpleFile *file) { _isOn = file->readNumber() != 0; _seasonUnused = file->readNumber(); _unused = file->readNumber(); - _floorNum = file->readNumber(); + _eyeFloorNum = file->readNumber(); _soundHandle = file->readNumber(); _channel4Glyph = file->readNumber(); _eyeFlag = file->readNumber(); @@ -261,7 +261,7 @@ bool CTelevision::MovieEndMsg(CMovieEndMsg *msg) { else petDisplayMessage(NOTHING_ON_CHANNEL); } else if (_channelNum == 5 && *CGetLiftEye2::_destObject != "NULL") { - loadFrame(393 + _floorNum); + loadFrame(393 + _eyeFloorNum); } else { petDisplayMessage(NOTHING_ON_CHANNEL); } @@ -270,7 +270,7 @@ bool CTelevision::MovieEndMsg(CMovieEndMsg *msg) { } bool CTelevision::ShipSettingMsg(CShipSettingMsg *msg) { - _floorNum = msg->_value; + _eyeFloorNum = msg->_value; return true; } diff --git a/engines/titanic/game/television.h b/engines/titanic/game/television.h index 02540e944a..9147e636ab 100644 --- a/engines/titanic/game/television.h +++ b/engines/titanic/game/television.h @@ -54,7 +54,7 @@ public: static int _seasonFrame; static bool _turnOn; static int _seasonUnused; - static int _floorNum; + static int _eyeFloorNum; static bool _channel4Glyph; static bool _eyeFlag; public: |