Changeset 2908 for code/branches/questsystem5/src/network/synchronisable

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/network/synchronisable/NetworkCallback.h (modified) (1 prop)
• src/network/synchronisable/Synchronisable.cc (modified) (1 prop)
• src/network/synchronisable/Synchronisable.h (modified) (1 prop)
• src/network/synchronisable/SynchronisableVariable.cc (modified) (2 diffs)
• src/network/synchronisable/SynchronisableVariable.h (modified) (3 diffs)

code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.cc

@@ -30 +30 @@
 #include <cstring>
 #include "util/Math.h"
-#include "core/GameMode.h"
 
 
@@ -37 +36 @@
 uint8_t SynchronisableVariableBase::state_ = 0;
 
-/*static*/ void SynchronisableVariableBase::setState()
-{
-  if ( state_ == 0x0 )
-  {
-    state_ = GameMode::isMaster() ? 0x1 : 0x2;  // set the appropriate mode here
-  }
-}
 
 

code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.h

@@ -35 +35 @@
 #include <string>
 #include <cassert>
-#include "util/Math.h"
+#include "core/Core.h"
+#include "core/CoreIncludes.h"
 #include "network/synchronisable/NetworkCallback.h"
 #include "network/synchronisable/NetworkCallbackManager.h"
@@ -62 +63 @@
       virtual ~SynchronisableVariableBase() {}
     protected:
-      static void setState();
       static uint8_t state_;
   };
@@ -110 +110 @@
       variable_( variable ), mode_( syncDirection ), callback_( cb )
   {
-      setState();
+    if ( state_ == 0x0 )
+    {
+      state_ = Core::isMaster() ? 0x1 : 0x2;  // set the appropriate mode here
+    }
   }