diff options
| author | Filippos Karapetis | 2009-11-04 14:22:17 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-11-04 14:22:17 +0000 |
| commit | c8fbac1517cd2cd60791d598fb1922846ff0b867 (patch) | |
| tree | affd460231664aa124193e0611af1c05a89589b7 /engines/sci/engine/state.cpp | |
| parent | f83d7c6339258cef9d1c53d91a4e2d7b2637d1ec (diff) | |
| download | scummvm-rg350-c8fbac1517cd2cd60791d598fb1922846ff0b867.tar.gz scummvm-rg350-c8fbac1517cd2cd60791d598fb1922846ff0b867.tar.bz2 scummvm-rg350-c8fbac1517cd2cd60791d598fb1922846ff0b867.zip | |
- Changed the segment manager to be a static part of the engine, and stopped deleting and recreating it when restoring games
- Merged game_exit(), script_free_vm_memory() and script_free_engine()
- Cleanup
svn-id: r45666
Diffstat (limited to 'engines/sci/engine/state.cpp')
| -rw-r--r-- | engines/sci/engine/state.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index 06cace2b99..7336bc71d6 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -32,8 +32,8 @@ namespace Sci { -EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SciGui *gui, AudioPlayer *audio) -: resMan(res), _kernel(kernel), _voc(voc), _gui(gui), _audio(audio), _dirseeker(this) { +EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, SegManager *segMan, SciGui *gui, AudioPlayer *audio) +: resMan(res), _kernel(kernel), _voc(voc), _segMan(segMan), _gui(gui), _audio(audio), _dirseeker(this) { gfx_state = 0; @@ -96,7 +96,6 @@ EngineState::EngineState(ResourceManager *res, Kernel *kernel, Vocabulary *voc, _gameObj = NULL_REG; - _segMan = 0; gc_countdown = 0; successor = 0; |