Просмотр исходного кода

Merge pull request #1822 from louis-mclaughlin/lua-compile-fix

Lua related compile fixes
Sean Taylor 10 лет назад
Родитель
Сommit
5e2acc3e2a
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      gameplay/src/ScriptController.inl
  2. 1 1
      gameplay/src/lua/lua_Global.cpp

+ 2 - 2
gameplay/src/ScriptController.inl

@@ -174,7 +174,7 @@ template<typename T> bool ScriptController::executeFunction(Script* script, cons
     bool success = executeFunctionHelper(1, func, NULL, NULL, script);
     bool success = executeFunctionHelper(1, func, NULL, NULL, script);
     if (out && success)
     if (out && success)
         *out = (T)((ScriptUtil::LuaObject*)lua_touserdata(_lua, -1))->instance;
         *out = (T)((ScriptUtil::LuaObject*)lua_touserdata(_lua, -1))->instance;
-    lua_settop(top);
+    lua_settop(_lua, top);
     return success;
     return success;
 }
 }
 
 
@@ -204,7 +204,7 @@ template<typename T> bool ScriptController::executeFunction(const char* func, co
     bool success = executeFunctionHelper(1, func, args, list, (Script*)NULL);
     bool success = executeFunctionHelper(1, func, args, list, (Script*)NULL);
     if (out && success)
     if (out && success)
         *out = (T)((ScriptUtil::LuaObject*)lua_touserdata(_lua, -1))->instance;
         *out = (T)((ScriptUtil::LuaObject*)lua_touserdata(_lua, -1))->instance;
-    lua_settop(top);
+    lua_settop(_lua, top);
     return success;
     return success;
 }
 }
 
 

+ 1 - 1
gameplay/src/lua/lua_Global.cpp

@@ -1109,7 +1109,7 @@ void* luaConvertObjectPointer(void* ptr, const char* fromType, const char* toTyp
     return itr->second(ptr, toType);
     return itr->second(ptr, toType);
 }
 }
 
 
-static int lua__strcmpnocase(lua_State* state)
+int lua__strcmpnocase(lua_State* state)
 {
 {
     // Get the number of parameters.
     // Get the number of parameters.
     int paramCount = lua_gettop(state);
     int paramCount = lua_gettop(state);