diff options
author | Filippos Karapetis | 2010-06-10 11:18:10 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-06-10 11:18:10 +0000 |
commit | 93f33c7dab009e8ff82fac195e7b6d02e66ab755 (patch) | |
tree | 6e96c80da2d5167d781a50f5c4b81b57af3a99b0 /engines/sci/sci.cpp | |
parent | a635b948239fbbd1ce302fb9d5eac943e90ca7ee (diff) | |
download | scummvm-rg350-93f33c7dab009e8ff82fac195e7b6d02e66ab755.tar.gz scummvm-rg350-93f33c7dab009e8ff82fac195e7b6d02e66ab755.tar.bz2 scummvm-rg350-93f33c7dab009e8ff82fac195e7b6d02e66ab755.zip |
Resolved a FIXME with getSciLanguage(), by creating a separate setter. Also, some camelCase changes
svn-id: r49568
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r-- | engines/sci/sci.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 3a3c147cb6..2b3194830d 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -304,7 +304,7 @@ bool SciEngine::initGame() { _gamestate->r_acc = _gamestate->r_prev = NULL_REG; _gamestate->_executionStack.clear(); // Start without any execution stack - _gamestate->execution_stack_base = -1; // No vm is running yet + _gamestate->executionStackBase = -1; // No vm is running yet _gamestate->_executionStackPosChanged = false; _gamestate->abortScriptProcessing = kAbortNone; @@ -325,7 +325,7 @@ bool SciEngine::initGame() { _vocabulary->parser_base = make_reg(_gamestate->_segMan->getSysStringsSegment(), SYS_STRING_PARSER_BASE); } - _gamestate->game_start_time = _gamestate->last_wait_time = g_system->getMillis(); + _gamestate->game_start_time = _gamestate->lastWaitTime = g_system->getMillis(); srand(g_system->getMillis()); // Initialize random number generator @@ -335,9 +335,7 @@ bool SciEngine::initGame() { #endif // Load game language into printLang property of game object - // FIXME: It's evil to achieve this as a side effect of a getter. - // Much better to have an explicit init method for this. - getSciLanguage(); + setSciLanguage(); return true; } |