yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eluna fix TC errors from previous commits, fix merge and fix a crash on osx

Browse Source
This commit is contained in:
Rochet2
2014-12-15 23:24:51 +02:00
parent 525e108b83
commit 7671054425
7 changed files with 133 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LuaEngine.cpp
View File

@@ -248,6 +248,7 @@ void Eluna::GetScripts(std::string path)
lua_requirepath +=
path + "/?;" +
path + "/?.lua;" +
path + "/?.ext;" +
path + "/?.dll;" +
path + "/?.so;";
@@ -290,6 +291,7 @@ void Eluna::GetScripts(std::string path)
lua_requirepath +=
path + "/?;" +
path + "/?.lua;" +
path + "/?.ext;" +
path + "/?.dll;" +
path + "/?.so;";
@@ -373,7 +375,7 @@ void Eluna::RunScripts()
lua_pop(L, 1);
if (!luaL_loadfile(L, it->filepath.c_str()) && !lua_pcall(L, 0, 1, 0))
{
if (!lua_toboolean(L, -1))
if (lua_isnoneornil(L, -1) || (lua_isboolean(L, -1) && !lua_toboolean(L, -1)))
{
lua_pop(L, 1);
Push(L, true);