Changeset 5655 for code/branches/resource2/src/orxonox

Timestamp:

Aug 17, 2009, 4:41:03 PM (15 years ago)

Author:

rgrieder

Message:

Added static DeclareToluaInterface macro to ease up tolua intefaces for modules.

Location:

code/branches/resource2/src/orxonox

Files:

• Main.cc (modified) (2 diffs)
• gamestates/GSRoot.cc (modified) (2 diffs)

code/branches/resource2/src/orxonox/Main.cc

@@ -48 +48 @@
 #include "core/CommandLine.h"
 #include "core/Game.h"
+#include "core/LuaState.h"
+#include "ToluaBindOrxonox.h"
 
 SetCommandLineSwitch(console).information("Start in console mode (text IO only)");
@@ -55 +57 @@
 SetCommandLineSwitch(dedicated).information("Start in dedicated server mode");
 SetCommandLineSwitch(standalone).information("Start in standalone mode");
+
+DeclareToluaInterface(Orxonox);
 
 /*

code/branches/resource2/src/orxonox/gamestates/GSRoot.cc

@@ -33 +33 @@
 #include "core/Game.h"
 #include "core/GameMode.h"
-#include "core/LuaState.h"
 #include "network/NetworkFunction.h"
-#include "ToluaBindOrxonox.h"
 #include "tools/Timer.h"
 #include "interfaces/TimeFactorListener.h"
@@ -53 +51 @@
         this->ccSetTimeFactor_ = 0;
         this->ccPause_ = 0;
-
-        // Tell LuaBind about all tolua interfaces
-        LuaState::addToluaInterface(&tolua_Orxonox_open, "Orxonox");
     }