SCI: Fix access to variables (gc_interval etc.) from the console

scummvm · May 27, 2011 · cb990e6 · cb990e6
1 parent ff62a60
commit cb990e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
@@ -74,6 +74,9 @@ static int parse_reg_t(EngineState *s, const char *str, reg_t *dest, bool mayBeV
 Console::Console(SciEngine *engine) : GUI::Debugger(),
 	_engine(engine), _debugState(engine->_debugState) {
 
+	assert(_engine);
+	assert(_engine->_gamestate);
+
 	// Variables
 	DVar_Register("sleeptime_factor",	&g_debug_sleeptime_factor, DVAR_INT, 0);
 	DVar_Register("gc_interval",		&engine->_gamestate->scriptGCInterval, DVAR_INT, 0);

diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
@@ -213,8 +213,6 @@ Common::Error SciEngine::run() {
 	_gfxScreen = new GfxScreen(_resMan);
 	_gfxScreen->enableUndithering(ConfMan.getBool("disable_dithering"));
 
-	// Create debugger console. It requires GFX to be initialized
-	_console = new Console(this);
 	_kernel = new Kernel(_resMan, segMan);
 
 	_features = new GameFeatures(segMan, _kernel);
@@ -227,6 +225,9 @@ Common::Error SciEngine::run() {
 	_gamestate = new EngineState(segMan);
 	_eventMan = new EventManager(_resMan->detectFontExtended());
 
+	// Create debugger console. It requires GFX and _gamestate to be initialized
+	_console = new Console(this);
+
 	// The game needs to be initialized before the graphics system is initialized, as
 	// the graphics code checks parts of the seg manager upon initialization (e.g. for
 	// the presence of the fastCast object)