TITANIC: Renamings for room flags sublevel methods

3 files changed, 23 insertions, 13 deletions

diff --git a/engines/titanic/pet_control/pet_control.h b/engines/titanic/pet_control/pet_control.h
index 6e64d8d344..a6915e6e13 100644
--- a/engines/titanic/pet_control/pet_control.h
+++ b/engines/titanic/pet_control/pet_control.h
@@ -499,11 +499,18 @@ public:
 		return _rooms.getWellEntry();
 	}
 
-	void setRooms1CC(int v) {
-		_rooms.set1CC(v);
+	/**
+	 * Sets the sub-level an SGT or 2nd class room is on
+	 */
+	void setRoomsSublevel(int level) {
+		_rooms.setSublevel(level);
 	}
-	int getRooms1CC() const {
-		return _rooms.get1CC();
+
+	/**
+	 * Gets the current sub-level for a stateroom
+	 */
+	int getRoomsSublevel() const {
+		return _rooms.getSublevel();
 	}
 
 	/**
diff --git a/engines/titanic/pet_control/pet_rooms.cpp b/engines/titanic/pet_control/pet_rooms.cpp
index e330241d28..4bc27094d7 100644
--- a/engines/titanic/pet_control/pet_rooms.cpp
+++ b/engines/titanic/pet_control/pet_rooms.cpp
@@ -30,7 +30,7 @@ CPetRooms::CPetRooms() :
 		_chevRightOnDim(nullptr), _chevRightOffDim(nullptr),
 		_chevLeftOnLit(nullptr), _chevLeftOffLit(nullptr),
 		_chevRightOnLit(nullptr), _chevRightOffLit(nullptr),
-		_floorNum(1), _elevatorNum(0), _roomNum(0), _field1CC(1),
+		_floorNum(1), _elevatorNum(0), _roomNum(0), _sublevel(1),
 		_wellEntry(0), _elevatorBroken(true) {
 }
 
@@ -139,7 +139,7 @@ void CPetRooms::load(SimpleFile *file, int param) {
 		_floorNum = file->readNumber();
 		_elevatorNum = file->readNumber();
 		_roomNum = file->readNumber();
-		_field1CC = file->readNumber();
+		_sublevel = file->readNumber();
 		_wellEntry = file->readNumber();
 		_elevatorBroken = file->readNumber();
 	}
@@ -155,7 +155,7 @@ void CPetRooms::save(SimpleFile *file, int indent) {
 	file->writeNumberLine(_floorNum, indent);
 	file->writeNumberLine(_elevatorNum, indent);
 	file->writeNumberLine(_roomNum, indent);
-	file->writeNumberLine(_field1CC, indent);
+	file->writeNumberLine(_sublevel, indent);
 	file->writeNumberLine(_wellEntry, indent);
 	file->writeNumberLine(_elevatorBroken, indent);
 }
@@ -260,7 +260,7 @@ uint CPetRooms::getRoomFlags() const {
 				roomFlags.setElevatorNum(_elevatorNum == 1 || _elevatorNum == 2 ? 2 : 4);
 			}
 
-			roomFlags.setRoomBits(((_roomNum - 1) & 1) + (_field1CC > 1 ? 3 : 1));
+			roomFlags.setRoomBits(((_roomNum - 1) & 1) + (_sublevel > 1 ? 3 : 1));
 		} else {
 			roomFlags.setRoomBits(0);
 		}
@@ -268,7 +268,7 @@ uint CPetRooms::getRoomFlags() const {
 
 	case THIRD_CLASS:
 		roomFlags.setElevatorNum(_elevatorNum);
-		roomFlags.setRoomBits(_roomNum + _field1CC * 6 - 6);
+		roomFlags.setRoomBits(_roomNum + _sublevel * 6 - 6);
 		break;
 
 	default:
diff --git a/engines/titanic/pet_control/pet_rooms.h b/engines/titanic/pet_control/pet_rooms.h
index 6b71359ce6..ecfeadf2b9 100644
--- a/engines/titanic/pet_control/pet_rooms.h
+++ b/engines/titanic/pet_control/pet_rooms.h
@@ -47,7 +47,7 @@ private:
 	int _floorNum;
 	int _elevatorNum;
 	int _roomNum;
-	int _field1CC;
+	int _sublevel;
 	int _wellEntry;
 	bool _elevatorBroken;
 private:
@@ -199,8 +199,8 @@ public:
 	int getElevatorNum() const { return _elevatorNum; }
 	void setRoomNum(int roomNum) { _roomNum = roomNum; }
 	int getRoomNum() const { return _roomNum; }
-	void set1CC(int val) { _field1CC = val; }
-	int get1CC() const { return _field1CC; }
+	void setSublevel(int level) { _sublevel = level; }
+	int getSublevel() const { return _sublevel; }
 
 	/**
 	 * Sets the entry number for arriving at the well
@@ -212,9 +212,12 @@ public:
 	 */
 	int getWellEntry() const { return _wellEntry; }
 
+	/**
+	 * Sets the broken elevator flag
+	 */
 	void setElevatorBroken(bool flag) { _elevatorBroken = flag; }
 };
 
 } // End of namespace Titanic
 
-#endif /* TITANIC_PET_ROOMS_SECTION_H */
+#endif /* TITANIC_PET_ROOMS_H */