Changeset 922

Timestamp:

03/15/10 23:46:33 (5 months ago)

Author:

zoogie

Message:

Reimplemented Game:get_on_init() using Luabind.

Location:

trunk/client/Game2

Files:

• GamePeer.cpp (modified) (2 diffs)
• GamePeer.h (modified) (1 diff)

trunk/client/Game2/GamePeer.cpp

@@ -58 +58 @@
     module(L) [
         class_<GamePeer>("Game")
+            .def("get_on_init", &LGetOnInit)
             .def("on_init", &LOnInit)
     ];
@@ -110 +111 @@
 }
 
-/*TODO
-int GamePeer::LGetOnInit(lua_State *state)
+void GamePeer::LGetOnInit()
 {
     // function get_on_init()
     // Returns the table of on_init callbacks (for debugging purposes).
-    SysConsole *self = static_cast<SysConsole*>(lua_touserdata(state, lua_upvalueindex(1)));
 
-    lua_rawgeti(state, LUA_REGISTRYINDEX, self->onInitRef);  // table
-
-    return 1;
+    lua_rawgeti(scripting->GetState(), LUA_REGISTRYINDEX, onInitRef);  // table
 }
-*/
 
 }  // namespace Client

trunk/client/Game2/GamePeer.h

@@ -54 +54 @@
     public:
         void LOnInit(const luabind::object &fn);
-        /*TODO
         void LGetOnInit();
-        */
 
     private: