From 63e2a01ecf2d5d5c56f657a87c48c761a88c5eb7 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Fri, 8 Apr 2016 18:53:05 -0400 Subject: [PATCH] TITANIC: Rename field in CGameState --- engines/titanic/events.cpp | 2 +- engines/titanic/game_state.cpp | 2 +- engines/titanic/game_state.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engines/titanic/events.cpp b/engines/titanic/events.cpp index d6f12f5c7d0..480cc915785 100644 --- a/engines/titanic/events.cpp +++ b/engines/titanic/events.cpp @@ -115,7 +115,7 @@ void Events::onIdle() { // Let the game manager perform any game updates gameManager->update(); - if (gameManager->_gameState._field20) { + if (gameManager->_gameState._quitGame) { // Game needs to shut down _vm->quitGame(); } diff --git a/engines/titanic/game_state.cpp b/engines/titanic/game_state.cpp index 280c917139b..92a0e3dea6d 100644 --- a/engines/titanic/game_state.cpp +++ b/engines/titanic/game_state.cpp @@ -46,7 +46,7 @@ bool CGameStateMovieList::clear() { CGameState::CGameState(CGameManager *gameManager) : _gameManager(gameManager), _gameLocation(this), _field8(0), _fieldC(0), _mode(GSMODE_UNSELECTED), _field14(0), _petActive(false), - _field1C(0), _field20(0), _field24(0), _nodeChangeCtr(0), + _field1C(0), _quitGame(false), _field24(0), _nodeChangeCtr(0), _nodeEnterTicks(0), _field38(0) { } diff --git a/engines/titanic/game_state.h b/engines/titanic/game_state.h index 5a53d217daf..5d4b686bf4d 100644 --- a/engines/titanic/game_state.h +++ b/engines/titanic/game_state.h @@ -60,7 +60,7 @@ public: int _field14; bool _petActive; int _field1C; - int _field20; + bool _quitGame; int _field24; uint _nodeChangeCtr; uint32 _nodeEnterTicks;