aboutsummaryrefslogtreecommitdiff
path: root/engines/titanic/game_state.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2016-11-05 11:02:39 -0400
committerPaul Gilbert2016-11-05 11:02:39 -0400
commit6eac69f45a436535e6c56e27cb144eed8719317f (patch)
treeb15cbc2aba460682e329ffb13fa9bc4c059fcb6e /engines/titanic/game_state.cpp
parent1c3ba9be1428b6344a2d7417aa9905cada6e6508 (diff)
downloadscummvm-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/game_state.cpp')
-rw-r--r--engines/titanic/game_state.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp
index bebc2ed8b4..8eae028387 100644
--- a/engines/titanic/game_state.cpp
+++ b/engines/titanic/game_state.cpp
@@ -45,10 +45,10 @@ bool CGameStateMovieList::clear() {
/*------------------------------------------------------------------------*/
CGameState::CGameState(CGameManager *gameManager) :
- _gameManager(gameManager), _gameLocation(this),
- _passengerClass(0), _priorClass(0), _mode(GSMODE_NONE),
- _seasonNum(SEASON_SUMMER), _petActive(false), _field1C(false), _quitGame(false),
- _field24(0), _nodeChangeCtr(0), _nodeEnterTicks(0), _field38(0) {
+ _gameManager(gameManager), _gameLocation(this), _passengerClass(NO_CLASS),
+ _priorClass(NO_CLASS), _mode(GSMODE_NONE), _seasonNum(SEASON_SUMMER),
+ _petActive(false), _field1C(false), _quitGame(false), _field24(0),
+ _nodeChangeCtr(0), _nodeEnterTicks(0), _field38(0) {
}
void CGameState::save(SimpleFile *file) const {
@@ -64,8 +64,8 @@ void CGameState::save(SimpleFile *file) const {
void CGameState::load(SimpleFile *file) {
_petActive = file->readNumber() != 0;
- _passengerClass = file->readNumber();
- _priorClass = file->readNumber();
+ _passengerClass = (PassengerClass)file->readNumber();
+ _priorClass = (PassengerClass)file->readNumber();
_seasonNum = (Season)file->readNumber();
_field24 = file->readNumber();
_field38 = file->readNumber();