thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Moved kernel_lookup_text inside the Kernel class

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

svn-id: r49076
This commit is contained in:
Filippos Karapetis 2010-05-18 12:16:48 +00:00
parent 75f4791a4a
commit 46af5a5162
7 changed files with 65 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/sci.cpp
View file

@ -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);