Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game)

svn-id: r42398

1 files changed, 5 insertions, 2 deletions

diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 9c94e2edde..504e38c7c1 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -100,7 +100,10 @@ SciEngine::~SciEngine() {
 	// Remove all of our debug levels here
 	Common::clearAllDebugChannels();
 
+	delete _kernel;
+	delete _vocabulary;
 	delete _console;
+	delete _resmgr;
 }
 
 Common::Error SciEngine::run() {
@@ -137,6 +140,8 @@ Common::Error SciEngine::run() {
 		return Common::kNoGameDataFoundError;
 	}
 
+	_kernel = new Kernel(_resmgr);
+	_vocabulary = new Vocabulary(_resmgr);
 	script_adjust_opcode_formats(_resmgr->_sciVersion);
 
 #if 0
@@ -229,8 +234,6 @@ Common::Error SciEngine::run() {
 
 	delete _gamestate;
 
-	delete _resmgr;
-
 	gfxop_exit(&gfx_state);
 
 	return Common::kNoError;