diff options
| author | anotherguest | 2013-12-06 08:31:08 +0100 |
|---|---|---|
| committer | anotherguest | 2013-12-06 08:31:08 +0100 |
| commit | d9c8cb71180efe12c4ee67eec03d84e4a0863f30 (patch) | |
| tree | 315718eecaa535d730cfb132ec863297f13085e9 /engines/sci/engine/seg_manager.cpp | |
| parent | 6cc047f8ebd11c9c078dd49a967b43ec0e58ad61 (diff) | |
| parent | 1c4685a5d034ffc41b209fef5d46b220d8405606 (diff) | |
| download | scummvm-rg350-d9c8cb71180efe12c4ee67eec03d84e4a0863f30.tar.gz scummvm-rg350-d9c8cb71180efe12c4ee67eec03d84e4a0863f30.tar.bz2 scummvm-rg350-d9c8cb71180efe12c4ee67eec03d84e4a0863f30.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/sci/engine/seg_manager.cpp')
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index a059bee74e..161a4f5c79 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -28,7 +28,8 @@ namespace Sci { -SegManager::SegManager(ResourceManager *resMan) { +SegManager::SegManager(ResourceManager *resMan, ScriptPatcher *scriptPatcher) + : _resMan(resMan), _scriptPatcher(scriptPatcher) { _heap.push_back(0); _clonesSegId = 0; @@ -44,8 +45,6 @@ SegManager::SegManager(ResourceManager *resMan) { _stringSegId = 0; #endif - _resMan = resMan; - createClassTable(); } @@ -983,7 +982,7 @@ int SegManager::instantiateScript(int scriptNum) { scr = allocateScript(scriptNum, &segmentId); } - scr->load(scriptNum, _resMan); + scr->load(scriptNum, _resMan, _scriptPatcher); scr->initializeLocals(this); scr->initializeClasses(this); scr->initializeObjects(this, segmentId); |