Changeset 2485 for code/branches/presentation/src/orxonox/gui

Timestamp:

Dec 16, 2008, 6:01:13 PM (16 years ago)

Author:

landauf

Message:

Merged objecthierarchy2 into presentation branch

Couln't merge 2 lines in Gamestate.cc and a whole block of code in GSDedicated.cc (it seems like oli implemented in both branches something like a network-tick-limiter but with different approaches)

Not yet tested in network mode and with bots
The SpaceShips movement is also not yet fully adopted to the new physics (see Engine class)

Location:

code/branches/presentation

Files:

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

code/branches/presentation/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_;
         }