- Moved kernel_lookup_text inside the Kernel class

- Added a pointer to the segment manager from within the Kernel class, thus simplifying the calls to it

svn-id: r49076

1 files changed, 3 insertions, 3 deletions

diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 53dc80d928..4862d0579a 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -140,6 +140,8 @@ Common::Error SciEngine::run() {
 		return Common::kNoGameDataFoundError;
 	}
 
+	SegManager *segMan = new SegManager(_resMan);
+
 	// Scale the screen, if needed
 	int upscaledHires = GFX_SCREEN_UPSCALED_DISABLED;
 
@@ -175,13 +177,11 @@ Common::Error SciEngine::run() {
 	// Create debugger console. It requires GFX to be initialized
 	_console = new Console(this);
 
-	_kernel = new Kernel(_resMan);
+	_kernel = new Kernel(_resMan, segMan);
 	// Only SCI0 and SCI01 games used a parser
 	_vocabulary = (getSciVersion() <= SCI_VERSION_1_EGA) ? new Vocabulary(_resMan) : NULL;
 	_audio = new AudioPlayer(_resMan);
 
-	SegManager *segMan = new SegManager(_resMan);
-
 	_features = new GameFeatures(segMan, _kernel);
 
 	_gamestate = new EngineState(_vocabulary, segMan);