Changeset 6762

Timestamp:

Apr 19, 2010, 5:45:29 PM (14 years ago)

Author:

rgrieder

Message:

Changes from last revision —> diff file for external libraries updated.

File:

• code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff (modified) (6 diffs)

code/trunk/src/external/ceguilua/ceguilua-0.6.2/ceguilua/changes_orxonox.diff

@@ -21 +21 @@
  // prototype for bindings initialisation function
  int tolua_CEGUI_open(lua_State* tolua_S);
-@@ -61,7 +57,7 @@
+@@ -59,9 +55,10 @@
+        Constructor (creates Lua state)
+ *************************************************************************/
  LuaScriptModule::LuaScriptModule() :
-     d_errFuncIndex(LUA_NOREF)
+-    d_errFuncIndex(LUA_NOREF)
++    d_errFuncIndex(LUA_NOREF),
++    d_activeErrFuncIndex(LUA_NOREF)
  {
 -    #if CEGUI_LUA_VER >= 51
@@ -30 +34 @@
              {"", luaopen_base},
              {LUA_LOADLIBNAME, luaopen_package},
-@@ -75,14 +71,14 @@
+@@ -75,14 +72,14 @@
          #endif
              {0, 0}
@@ -47 +51 @@
              for (; lib->func; lib++)
              {
-@@ -90,7 +86,7 @@
+@@ -90,7 +87,7 @@
                  lua_pushstring(d_state, lib->name);
                  lua_call(d_state, 1, 0);
@@ -56 +60 @@
          luaopen_io(d_state);
          luaopen_string(d_state);
-@@ -99,7 +95,7 @@
+@@ -99,7 +96,7 @@
          #if defined(DEBUG) || defined (_DEBUG)
              luaopen_debug(d_state);
@@ -65 +69 @@
      setModuleIdentifierString();
  }
+@@ -108,7 +105,9 @@
+ /*************************************************************************
+        Constructor (uses given Lua state)
+ *************************************************************************/
+-LuaScriptModule::LuaScriptModule(lua_State* state)
++LuaScriptModule::LuaScriptModule(lua_State* state) :
++    d_errFuncIndex(LUA_NOREF),
++    d_activeErrFuncIndex(LUA_NOREF)
+ {
+        // just use the given state
+        d_ownsState = false;
 --- CEGUILua.h  Sun Jan 25 18:32:57 2009
 +++ CEGUILua.h  Thu Jan 29 10:17:42 2009
@@ -91 +106 @@
  // Start of CEGUI namespace section
  namespace CEGUI
+@@ -199,6 +199,10 @@
+     bool ret = lua_isboolean(L, -1) ? lua_toboolean(L, -1 ) : true;
+     lua_pop(L, 1);
+ 
++    // remove error handler from stack
++    if (err_idx != 0)
++        lua_remove(L, err_idx);
++
+        if(helper)
+        {
+                delete helper;