libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-17 07:07:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HDB: Add _systemInit check to LuaScript

Browse Source
This commit is contained in:
Nipun Garg 2019-06-02 19:03:34 +05:30 committed by Eugene Sandulenko
parent f88b1d0d6a
commit 0ad5f7e180
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engines/hdb/lua-script.cpp
View File

@ -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;
}

1
engines/hdb/lua-script.h
View File

@ -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;