matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not use loadstring to load autorun (who even wrote this?). Also print a message in case of successful autorun load

Browse Source
This commit is contained in:
mniip 2014-03-04 15:26:35 +04:00
parent 64e16025d8
commit 4152bb560e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lua/LuaScriptInterface.cpp
View File

@ -334,9 +334,14 @@ tpt.partsdata = nil");
void LuaScriptInterface::Init() void LuaScriptInterface::Init()
{ {
if(Client::Ref().FileExists("autorun.lua")) if(Client::Ref().FileExists("autorun.lua"))
if(luacon_eval("dofile(\"autorun.lua\")")) {
lua_State *l = luacon_ci->l;
if(luaL_loadfile(l, "autorun.lua") || lua_pcall(l, 0, 0, 0))
luacon_ci->Log(CommandInterface::LogError, luacon_geterror()); luacon_ci->Log(CommandInterface::LogError, luacon_geterror());
else
luacon_ci->Log(CommandInterface::LogNotice, "Loaded autorun.lua");
}
} }
void LuaScriptInterface::SetWindow(ui::Window * window) void LuaScriptInterface::SetWindow(ui::Window * window)