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/sci.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/sci.cpp')
-rw-r--r-- | engines/sci/sci.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp index 065565d8de..69a7c0bc56 100644 --- a/engines/sci/sci.cpp +++ b/engines/sci/sci.cpp @@ -38,6 +38,7 @@ #include "sci/engine/state.h" #include "sci/engine/kernel.h" #include "sci/engine/script.h" // for script_adjust_opcode_formats +#include "sci/engine/script_patches.h" #include "sci/engine/selector.h" // for SELECTOR #include "sci/sound/audio.h" @@ -184,6 +185,7 @@ SciEngine::~SciEngine() { delete[] _opcode_formats; + delete _scriptPatcher; delete _resMan; // should be deleted last g_sci = 0; } @@ -217,8 +219,9 @@ Common::Error SciEngine::run() { // Add the after market GM patches for the specified game, if they exist _resMan->addNewGMPatch(_gameId); _gameObjectAddress = _resMan->findGameObject(); - - SegManager *segMan = new SegManager(_resMan); + + _scriptPatcher = new ScriptPatcher(); + SegManager *segMan = new SegManager(_resMan, _scriptPatcher); // Initialize the game screen _gfxScreen = new GfxScreen(_resMan); |