TITANIC: Further changes to use PassengerClass enum

scummvm · Nov 6, 2016 · 2202d32 · 2202d32
1 parent d8d11ba
commit 2202d32
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/engines/titanic/pet_control/pet_gfx_element.cpp b/engines/titanic/pet_control/pet_gfx_element.cpp
@@ -49,11 +49,11 @@ void CPetGfxElement::reset(const CString &name, CPetControl *petControl, PetElem
 		return;
 
 	CString numString(3);
-	int classNum = petControl->getPassengerClass();
+	PassengerClass classNum = petControl->getPassengerClass();
 
-	if (classNum >= 1 && classNum <= 3) {
+	if (classNum >= FIRST_CLASS && classNum <= THIRD_CLASS) {
 		numString = CString(classNum);
-	} else if (classNum == 4) {
+	} else if (classNum == UNCHECKED) {
 		int stateC = petControl->getPriorClass();
 		if (stateC == 1)
 			numString = CString(stateC);

diff --git a/engines/titanic/pet_control/pet_rooms.cpp b/engines/titanic/pet_control/pet_rooms.cpp
@@ -241,17 +241,17 @@ uint CPetRooms::getRoomFlags() const {
 	if (flags)
 		return flags;
 
-	int classNum = roomFlags.whatPassengerClass(_floorNum);
+	PassengerClass classNum = roomFlags.whatPassengerClass(_floorNum);
 	roomFlags.setPassengerClassBits(classNum);
 	roomFlags.setFloorNum(_floorNum);
 
 	switch (classNum) {
-	case 1:
+	case FIRST_CLASS:
 		roomFlags.setElevatorNum(_elevatorNum);
 		roomFlags.setRoomBits(_roomNum);
 		break;
 
-	case 2:
+	case SECOND_CLASS:
 		if (_roomNum > 0) {
 			if (_roomNum >= 3) {
 				roomFlags.setElevatorNum(_elevatorNum == 1 || _elevatorNum == 2 ? 1 : 3);
@@ -265,7 +265,7 @@ uint CPetRooms::getRoomFlags() const {
 		}
 		break;
 
-	case 3:
+	case THIRD_CLASS:
 		roomFlags.setElevatorNum(_elevatorNum);
 		roomFlags.setRoomBits(_roomNum + _field1CC * 6 - 6);
 		break;

diff --git a/engines/titanic/room_flags.cpp b/engines/titanic/room_flags.cpp
@@ -479,23 +479,23 @@ void CRoomFlags::setRandomLocation(int classNum, bool flag) {
 
 	do {
 		switch (classNum) {
-		case 1:
+		case FIRST_CLASS:
 			minFloor = 2;
 			maxFloor = 19;
 			minRoom = 1;
 			maxRoom = 3;
 			elevNum = g_vm->getRandomNumber(flag ? 2 : 3);
 			break;
 
-		case 2:
+		case SECOND_CLASS:
 			minFloor = 20;
 			maxFloor = 27;
 			elevNum = g_vm->getRandomNumber(flag ? 2 : 3);
 			minRoom = 1;
 			maxRoom = ((elevNum - 1) & 1) ? 3 : 4;
 			break;
 
-		case 3:
+		case THIRD_CLASS:
 			minRoom = 1;
 			minFloor = 28;
 			maxFloor = 38;
@@ -517,11 +517,11 @@ void CRoomFlags::setRandomLocation(int classNum, bool flag) {
 	} while (_data == 0x59706);
 }
 
-int CRoomFlags::whatPassengerClass(int floorNum) {
+PassengerClass CRoomFlags::whatPassengerClass(int floorNum) {
 	if (is2To19(floorNum))
-		return 1;
+		return FIRST_CLASS;
 
-	return is20To27(floorNum) ? 2 : 3;
+	return is20To27(floorNum) ? SECOND_CLASS : THIRD_CLASS;
 }
 
 } // End of namespace Titanic
diff --git a/engines/titanic/room_flags.h b/engines/titanic/room_flags.h
@@ -221,7 +221,7 @@ class CRoomFlags {
 	/**
 	 * Returns what passenger class a particular floor number belongs to
 	 */
-	static int whatPassengerClass(int floorNum);
+	static PassengerClass whatPassengerClass(int floorNum);
 
 	bool not5() const { return getConditionally() != 5; }
 

diff --git a/engines/titanic/true_talk/liftbot_script.cpp b/engines/titanic/true_talk/liftbot_script.cpp
@@ -580,14 +580,14 @@ int LiftbotScript::sentence1(const TTsentence *sentence) {
 		return 1;
 	}
 
-	int classNum = 1;
+	PassengerClass classNum = FIRST_CLASS;
 	bool classSet = true;
 	if (sentence->localWord("firstclass"))
-		classNum = 1;
+		classNum = FIRST_CLASS;
 	else if (sentence->localWord("secondclass"))
-		classNum = 2;
+		classNum = SECOND_CLASS;
 	else if (sentence->localWord("thirdclass"))
-		classNum = 3;
+		classNum = THIRD_CLASS;
 	else
 		classSet = false;