HDB: Add _systemInit check to LuaScript

2 files changed, 16 insertions, 0 deletions

diff --git a/engines/hdb/lua-script.cpp b/engines/hdb/lua-script.cpp
index a844451998..3793b903a9 100644
--- a/engines/hdb/lua-script.cpp
+++ b/engines/hdb/lua-script.cpp
@@ -23,12 +23,15 @@
 #include "common/lua/lua.h"
 #include "common/lua/lauxlib.h"
 #include "common/lua/lualib.h"
+#include "common/debug.h"
+
 #include "hdb/lua-script.h"
 
 namespace HDB {
 
 LuaScript::LuaScript() {
 	_state = NULL;
+	_systemInit = false;
 }
 
 LuaScript::~LuaScript() {
@@ -45,11 +48,17 @@ bool LuaScript::init() {
 		return false;
 	}
 
+	_systemInit = true;
+
 	return true;
 }
 
 bool LuaScript::executeFile(const Common::String &filename) {
 	
+	if (!_systemInit) {
+		return false;
+	}
+
 	Common::File *file = new Common::File;
 
 	if (!file->open(filename)) {
@@ -80,6 +89,11 @@ bool LuaScript::registerStdLibs() {
 }
 
 bool LuaScript::executeChunk(const char *chunk, uint chunkSize, const Common::String &chunkName) const {
+	
+	if (!_systemInit) {
+		return false;
+	}
+	
 	// Compile Chunk
 	if (luaL_loadbuffer(_state, chunk, chunkSize, chunkName.c_str())) {
 		error("Couldn't compile \"%s\": %s", chunkName.c_str(), lua_tostring(_state, -1));
@@ -96,6 +110,7 @@ bool LuaScript::executeChunk(const char *chunk, uint chunkSize, const Common::St
 		return false;
 	}
 
+	debug("Chunk successfully executed");
 	return true;
 }
 
diff --git a/engines/hdb/lua-script.h b/engines/hdb/lua-script.h
index bf2277364e..8a9441a240 100644
--- a/engines/hdb/lua-script.h
+++ b/engines/hdb/lua-script.h
@@ -43,6 +43,7 @@ public:
 
 private:
 	lua_State *_state;
+	bool _systemInit;
 
 	bool registerStdLibs();
 	bool executeChunk(const char *chunk, uint chunkSize, const Common::String &chunkName) const;