diff options
| author | Filippos Karapetis | 2010-06-09 21:41:20 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-06-09 21:41:20 +0000 |
| commit | 14437e6394172dcabd0f5255b724c38f5b862332 (patch) | |
| tree | 4fa7a88376923968f0e4bea516d102b6274df6ee /engines/sci/engine | |
| parent | d44efa817fd997f336ac83f0490212fb21e9bf02 (diff) | |
| download | scummvm-rg350-14437e6394172dcabd0f5255b724c38f5b862332.tar.gz scummvm-rg350-14437e6394172dcabd0f5255b724c38f5b862332.tar.bz2 scummvm-rg350-14437e6394172dcabd0f5255b724c38f5b862332.zip | |
The segment manager is now initialized before the graphics subsystem. Fixes the detection of the fastCast object on startup, and hence fixes LSL1VGA
svn-id: r49553
Diffstat (limited to 'engines/sci/engine')
| -rw-r--r-- | engines/sci/engine/game.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp index 704fe877c7..04f8501027 100644 --- a/engines/sci/engine/game.cpp +++ b/engines/sci/engine/game.cpp @@ -74,6 +74,9 @@ int game_init(EngineState *s) { s->initGlobals(); + if (s->abortScriptProcessing == kAbortRestartGame && g_sci->_gfxMenu) + g_sci->_gfxMenu->reset(); + s->_segMan->initSysStrings(); s->r_acc = s->r_prev = NULL_REG; @@ -101,10 +104,6 @@ int game_init(EngineState *s) { voc->parser_base = make_reg(s->_segMan->getSysStringsSegment(), SYS_STRING_PARSER_BASE); } - // Initialize menu TODO: Actually this should be another init() - if (g_sci->_gfxMenu) - g_sci->_gfxMenu->reset(); - s->game_start_time = g_system->getMillis(); s->last_wait_time = s->game_start_time; |