Changeset 2662 for code/trunk/src/orxonox/gui

Timestamp:

Feb 14, 2009, 10:17:35 PM (16 years ago)

Author:

rgrieder

Message:

Merged presentation branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/gui/GUIManager.cc (modified) (1 diff)

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -96 +96 @@
         {
             // destroy our own tolua interfaces
-                //lua_pushnil(luaState_);
-                //lua_setglobal(luaState_, "Orxonox");
-                //lua_pushnil(luaState_);
-                //lua_setglobal(luaState_, "Core");
+                lua_pushnil(luaState_);
+                lua_setglobal(luaState_, "Orxonox");
+                lua_pushnil(luaState_);
+                lua_setglobal(luaState_, "Core");
             // TODO: deleting the script module fails an assertation.
             // However there is not much we can do about it since it occurs too when
             // we don't open Core or Orxonox. Might be a CEGUI issue.
             // The memory leak is not a problem anyway..
-            //delete scriptModule_;
+            delete scriptModule_;
         }