diff options
| author | Filippos Karapetis | 2010-01-29 22:56:39 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-29 22:56:39 +0000 |
| commit | 99f59d858e89c2cf7d5f96c919b2793b167c3099 (patch) | |
| tree | 514e81657ac7dab08b53aac0ec0b2d622c4cebf4 /engines | |
| parent | 67035764524d98d3f528c75217db5db231fa788e (diff) | |
| download | scummvm-rg350-99f59d858e89c2cf7d5f96c919b2793b167c3099.tar.gz scummvm-rg350-99f59d858e89c2cf7d5f96c919b2793b167c3099.tar.bz2 scummvm-rg350-99f59d858e89c2cf7d5f96c919b2793b167c3099.zip | |
_gui and _gui32 are now properly initialized
svn-id: r47687
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/sci.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index de608a2765..63fba8eeb0 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -167,12 +167,17 @@ Common::Error SciEngine::run() { return Common::kUnknownError; #ifdef ENABLE_SCI32 - if (getSciVersion() >= SCI_VERSION_2) + if (getSciVersion() >= SCI_VERSION_2) { + _gamestate->_gui = 0; _gamestate->_gui32 = new SciGui32(_gamestate, screen, palette, cursor); - else -#endif + } else { _gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor, _audio); - + _gamestate->_gui32 = 0; + } +#else + _gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor, _audio); + _gamestate->_gui32 = 0; +#endif if (game_init(_gamestate)) { /* Initialize */ warning("Game initialization failed: Aborting..."); |