Changeset 2896 for code/trunk/src/network/synchronisable

Timestamp:

Apr 6, 2009, 1:59:00 AM (16 years ago)

Author:

landauf

Message:

Merged gui branch back to trunk.

I did 2 small changes in IngameManager.cc on line 777 and 888 (yes, really), because const_reverse_iterator strangely doesn't work on MinGW.

Location:

code/trunk

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/trunk/src/network/synchronisable/SynchronisableVariable.cc

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

code/trunk/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();
   }