diff options
author | Filippos Karapetis | 2010-05-18 12:16:48 +0000 |
---|---|---|
committer | Filippos Karapetis | 2010-05-18 12:16:48 +0000 |
commit | 46af5a5162db4c2b5c238f02465ee226c04e834f (patch) | |
tree | 30a4919d95dff23137bb0f626ec2d24a271b36d1 /engines/sci/sci.cpp | |
parent | 75f4791a4a97889cd01663e9cc882682e58b6177 (diff) | |
download | scummvm-rg350-46af5a5162db4c2b5c238f02465ee226c04e834f.tar.gz scummvm-rg350-46af5a5162db4c2b5c238f02465ee226c04e834f.tar.bz2 scummvm-rg350-46af5a5162db4c2b5c238f02465ee226c04e834f.zip |
- 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
Diffstat (limited to 'engines/sci/sci.cpp')
-rw-r--r-- | engines/sci/sci.cpp | 6 |
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); |