diff options
author | Paul Gilbert | 2016-08-02 19:27:00 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-08-02 19:27:00 -0400 |
commit | 99b353b9fef51eccbf88b1bfa8a69381369dfd50 (patch) | |
tree | a856aa3f2d725c5ee8caa9f0f9b5d8887843785a /engines/titanic/pet_control | |
parent | 17762761fe01b467bf2df2e33b3d7293eb40c26c (diff) | |
download | scummvm-rg350-99b353b9fef51eccbf88b1bfa8a69381369dfd50.tar.gz scummvm-rg350-99b353b9fef51eccbf88b1bfa8a69381369dfd50.tar.bz2 scummvm-rg350-99b353b9fef51eccbf88b1bfa8a69381369dfd50.zip |
TITANIC: Added CPETPosition enterViewMsg
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_control.h | 16 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_rooms.cpp | 6 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_rooms.h | 15 |
3 files changed, 27 insertions, 10 deletions
diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h index ef7e49d4e4..a86d110458 100644 --- a/engines/titanic/pet_control/pet_control.h +++ b/engines/titanic/pet_control/pet_control.h @@ -470,12 +470,20 @@ public: return _rooms.getRoomNum(); } - void setRooms1D0(int v) { - _rooms.set1D0(v); + /** + * Sets the entry number for arriving at the well + */ + void setRoomsWellEntry(int entryNum) { + _rooms.setWellEntry(entryNum); } - int getRooms1D0() const { - return _rooms.get1D0(); + + /** + * Gets the entry number used when last arriving at the well + */ + int getRoomsWellEntry() const { + return _rooms.getWellEntry(); } + void setRooms1CC(int v) { _rooms.set1CC(v); } diff --git a/engines/titanic/pet_control/pet_rooms.cpp b/engines/titanic/pet_control/pet_rooms.cpp index fcf8238eb6..2415c96966 100644 --- a/engines/titanic/pet_control/pet_rooms.cpp +++ b/engines/titanic/pet_control/pet_rooms.cpp @@ -31,7 +31,7 @@ CPetRooms::CPetRooms() : _chevLeftOnLit(nullptr), _chevLeftOffLit(nullptr), _chevRightOnLit(nullptr), _chevRightOffLit(nullptr), _floorNum(0), _elevatorNum(0), _roomNum(0), _field1CC(0), - _field1D0(0), _field1D4(0) { + _wellEntry(0), _field1D4(0) { } bool CPetRooms::setup(CPetControl *petControl) { @@ -139,7 +139,7 @@ void CPetRooms::load(SimpleFile *file, int param) { _elevatorNum = file->readNumber(); _roomNum = file->readNumber(); _field1CC = file->readNumber(); - _field1D0 = file->readNumber(); + _wellEntry = file->readNumber(); _field1D4 = file->readNumber(); } } @@ -155,7 +155,7 @@ void CPetRooms::save(SimpleFile *file, int indent) { file->writeNumberLine(_elevatorNum, indent); file->writeNumberLine(_roomNum, indent); file->writeNumberLine(_field1CC, indent); - file->writeNumberLine(_field1D0, indent); + file->writeNumberLine(_wellEntry, indent); file->writeNumberLine(_field1D4, indent); } diff --git a/engines/titanic/pet_control/pet_rooms.h b/engines/titanic/pet_control/pet_rooms.h index ba3356091a..af1ea2ae4f 100644 --- a/engines/titanic/pet_control/pet_rooms.h +++ b/engines/titanic/pet_control/pet_rooms.h @@ -47,7 +47,7 @@ private: int _elevatorNum; int _roomNum; int _field1CC; - int _field1D0; + int _wellEntry; int _field1D4; private: /** @@ -200,8 +200,17 @@ public: int getRoomNum() const { return _roomNum; } void set1CC(int val) { _field1CC = val; } int get1CC() const { return _field1CC; } - void set1D0(int val) { _field1D0 = val; } - int get1D0() const { return _field1D0; } + + /** + * Sets the entry number for arriving at the well + */ + void setWellEntry(int val) { _wellEntry = val; } + + /** + * Gets the entry number used when last arriving at the well + */ + int getWellEntry() const { return _wellEntry; } + void set1D4(int val) { _field1D4 = val; } }; |