Changeset 8068 in orxonox.OLD for trunk/src/lib/network/synchronizeable.cc

Timestamp:

Jun 1, 2006, 2:28:16 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk

File:

• trunk/src/lib/network/synchronizeable.cc (modified) (7 diffs)

trunk/src/lib/network/synchronizeable.cc

@@ -21 +21 @@
 #include "netdefs.h"
 #include "network_log.h"
+#include "network_game_manager.h"
 
 #include "state.h"
@@ -36 +37 @@
 {
   this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
-  this->owner = -1;
+  this->owner = 0;
   this->hostID = SharedNetworkData::getInstance()->getHostID();
   this->setIsServer(this->hostID == 0);
@@ -68 +69 @@
   if ( this->networkStream )
     this->networkStream->disconnectSynchronizeable(*this);
+  
+  if ( this->isServer() && this->beSynchronized() && this->getUniqueID() > 0 )
+    NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
 }
 
@@ -175 +179 @@
             this->isServer() && (*it)->checkPermission( PERMISSION_SERVER ) ||
             this->owner == this->hostID && (*it)->checkPermission( PERMISSION_OWNER ) ||
+            this->isServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER ) ||
             (*it)->checkPermission( PERMISSION_ALL ) 
                     );
@@ -289 +294 @@
         (*it)->checkPermission( PERMISSION_SERVER ) && networkStream->isUserServer( userId ) ||
         (*it)->checkPermission( PERMISSION_OWNER ) && this->owner == userId ||
+        networkStream->isUserServer( userId ) && this->owner != getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) ||
         (*it)->checkPermission( PERMISSION_ALL ) 
        )
@@ -331 +337 @@
 void Synchronizeable::registerVar( SynchronizeableVar * var )
 {
-  PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
+  //PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
   syncVarList.push_back( var );
 }
@@ -343 +349 @@
 int Synchronizeable::registerVarId( SynchronizeableVar * var )
 {
-  PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
+  //PRINTF(0)("ADDING VAR: %s\n", var->getName().c_str());
   syncVarList.push_back( var );
   var->setWatched( true );