diff options
| author | Paul Gilbert | 2016-08-27 20:44:44 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-27 20:44:44 -0400 |
| commit | 67be58f56204d6662a56f902b0a0f017c176b643 (patch) | |
| tree | 9a95bf73bdc01556734064ca8afd1c30cbcd51dd /engines/titanic/true_talk | |
| parent | 311006c84cd85897cb9c536e948bc6f5d36b3805 (diff) | |
| download | scummvm-rg350-67be58f56204d6662a56f902b0a0f017c176b643.tar.gz scummvm-rg350-67be58f56204d6662a56f902b0a0f017c176b643.tar.bz2 scummvm-rg350-67be58f56204d6662a56f902b0a0f017c176b643.zip | |
TITANIC: Implemented more game classes, fleshed out season handling
Diffstat (limited to 'engines/titanic/true_talk')
| -rw-r--r-- | engines/titanic/true_talk/true_talk_manager.cpp | 4 | ||||
| -rw-r--r-- | engines/titanic/true_talk/true_talk_manager.h | 3 | ||||
| -rw-r--r-- | engines/titanic/true_talk/tt_npc_script.cpp | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/engines/titanic/true_talk/true_talk_manager.cpp b/engines/titanic/true_talk/true_talk_manager.cpp index 19beee9796..9913f55a8d 100644 --- a/engines/titanic/true_talk/true_talk_manager.cpp +++ b/engines/titanic/true_talk/true_talk_manager.cpp @@ -589,9 +589,9 @@ int CTrueTalkManager::getPassengerClass() const { return gameState ? gameState->_passengerClass : 4; } -int CTrueTalkManager::getState14() const { +Season CTrueTalkManager::getCurrentSeason() const { CGameState *gameState = getGameState(); - return gameState ? gameState->_field14 : 0; + return gameState ? gameState->_seasonNum : SEASON_SUMMER; } } // End of namespace Titanic diff --git a/engines/titanic/true_talk/true_talk_manager.h b/engines/titanic/true_talk/true_talk_manager.h index 8a8895917a..f77c9640db 100644 --- a/engines/titanic/true_talk/true_talk_manager.h +++ b/engines/titanic/true_talk/true_talk_manager.h @@ -31,6 +31,7 @@ #include "titanic/true_talk/tt_quotes_tree.h" #include "titanic/true_talk/tt_scripts.h" #include "titanic/true_talk/tt_talker.h" +#include "titanic/game_state.h" namespace Titanic { @@ -237,7 +238,7 @@ public: */ int getPassengerClass() const; - int getState14() const; + Season getCurrentSeason() const; }; } // End of namespace Titanic diff --git a/engines/titanic/true_talk/tt_npc_script.cpp b/engines/titanic/true_talk/tt_npc_script.cpp index 61c3b0e00c..280894c05a 100644 --- a/engines/titanic/true_talk/tt_npc_script.cpp +++ b/engines/titanic/true_talk/tt_npc_script.cpp @@ -579,14 +579,14 @@ int TTnpcScript::getValue(int testNum) const { case 4: if (g_vm->_trueTalkManager) { - switch (g_vm->_trueTalkManager->getState14()) { - case 1: + switch (g_vm->_trueTalkManager->getCurrentSeason()) { + case SEASON_AUTUMN: CTrueTalkManager::_v6 = 3; break; - case 2: + case SEASON_WINTER: CTrueTalkManager::_v6 = 0; break; - case 3: + case SEASON_SPRING: CTrueTalkManager::_v6 = 1; break; default: |