Changeset 7172 for code/trunk/src/orxonox/gamestates

Timestamp:

Aug 17, 2010, 8:25:21 PM (14 years ago)

Author:

landauf

Message:

removed network as dependency of tools. these libraries can build in parallel again now.
moved network synchronization of setTimeFactor from TimeFactorListener to GSRoot (GSRoot inherits from TimeFactorListener now)

Location:

code/trunk/src/orxonox/gamestates

Files:

• GSRoot.cc (modified) (3 diffs)
• GSRoot.h (modified) (2 diffs)

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -36 +36 @@
 #include "network/NetworkFunction.h"
 #include "tools/Timer.h"
-#include "tools/interfaces/TimeFactorListener.h"
 #include "tools/interfaces/Tickable.h"
 
@@ -43 +42 @@
     DeclareGameState(GSRoot, "root", false, false);
     SetConsoleCommandShortcut(GSRoot, printObjects);
+
+    registerStaticNetworkFunction(&TimeFactorListener::setTimeFactor);
 
     GSRoot::GSRoot(const GameStateInfo& info)
@@ -153 +154 @@
     }
 
-    float GSRoot::getTimeFactor()
+    void GSRoot::changedTimeFactor(float factor_new, float factor_old)
     {
-        return TimeFactorListener::getTimeFactor();
+        if (!GameMode::isStandalone())
+            callStaticNetworkFunction(&TimeFactorListener::setTimeFactor, CLIENTID_UNKNOWN, factor_new);
     }
 }

code/trunk/src/orxonox/gamestates/GSRoot.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "core/GameState.h"
+#include "tools/interfaces/TimeFactorListener.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSRoot : public GameState
+    class _OrxonoxExport GSRoot : public GameState, public TimeFactorListener
     {
     public:
@@ -51 +52 @@
         void setTimeFactor(float factor);
         void pause();
-        float getTimeFactor();
+
+    protected:
+        virtual void changedTimeFactor(float factor_new, float factor_old);
 
     private: