diff options
author | Paul Gilbert | 2016-11-05 11:02:39 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-11-05 11:02:39 -0400 |
commit | 6eac69f45a436535e6c56e27cb144eed8719317f (patch) | |
tree | b15cbc2aba460682e329ffb13fa9bc4c059fcb6e /engines/titanic/core/game_object.cpp | |
parent | 1c3ba9be1428b6344a2d7417aa9905cada6e6508 (diff) | |
download | scummvm-rg350-6eac69f45a436535e6c56e27cb144eed8719317f.tar.gz scummvm-rg350-6eac69f45a436535e6c56e27cb144eed8719317f.tar.bz2 scummvm-rg350-6eac69f45a436535e6c56e27cb144eed8719317f.zip |
TITANIC: Replaced int passenger class with PassengerClass enum
Diffstat (limited to 'engines/titanic/core/game_object.cpp')
-rw-r--r-- | engines/titanic/core/game_object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/core/game_object.cpp b/engines/titanic/core/game_object.cpp index 3738108c69..545868b582 100644 --- a/engines/titanic/core/game_object.cpp +++ b/engines/titanic/core/game_object.cpp @@ -1336,17 +1336,17 @@ CMusicRoom *CGameObject::getMusicRoom() const { return gameManager ? &gameManager->_musicRoom : nullptr; } -int CGameObject::getPassengerClass() const { +PassengerClass CGameObject::getPassengerClass() const { CGameManager *gameManager = getGameManager(); - return gameManager ? gameManager->_gameState._passengerClass : 3; + return gameManager ? gameManager->_gameState._passengerClass : THIRD_CLASS; } -int CGameObject::getPriorClass() const { +PassengerClass CGameObject::getPriorClass() const { CGameManager *gameManager = getGameManager(); - return gameManager ? gameManager->_gameState._priorClass : 3; + return gameManager ? gameManager->_gameState._priorClass : THIRD_CLASS; } -void CGameObject::setPassengerClass(int newClass) { +void CGameObject::setPassengerClass(PassengerClass newClass) { if (newClass >= 1 && newClass <= 4) { // Change the passenger class CGameManager *gameMan = getGameManager(); @@ -1581,7 +1581,7 @@ void CGameObject::petMoveToHiddenRoom() { } } -void CGameObject::petReassignRoom(int passClassNum) { +void CGameObject::petReassignRoom(PassengerClass passClassNum) { CPetControl *petControl = getPetControl(); if (petControl) petControl->reassignRoom(passClassNum); |