Changeset 5742 for code/trunk

Timestamp:

Sep 6, 2009, 5:03:30 PM (15 years ago)

Author:

scheusso

Message:

fixed a small bug which caused object id inconsistency on clients

File:

• code/trunk/src/libraries/network/synchronisable/Synchronisable.cc (modified) (2 diffs)

code/trunk/src/libraries/network/synchronisable/Synchronisable.cc

@@ -33 +33 @@
 #include <cstdlib>
 #include "core/CoreIncludes.h"
+#include "core/GameMode.h"
 #include "core/BaseObject.h"
 #include "network/Host.h"
@@ -52 +53 @@
     static uint32_t idCounter=0;
     objectMode_=0x1; // by default do not send data to server
-    if ( !Host::running() || ( Host::running() && Host::isServer() ) )
+    if ( GameMode::isMaster() || ( Host::running() && Host::isServer() ) )
     {
       this->objectID = idCounter++; //this is only needed when running a server