Changeset 2907 for code/branches/questsystem5/src/network/synchronisable/SynchronisableVariable.h

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/network/synchronisable/SynchronisableVariable.h (modified) (3 diffs)

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

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