Changeset 9630 in orxonox.OLD for branches

Timestamp:

Jul 31, 2006, 1:41:56 AM (19 years ago)

Author:

patrick

Message:

logical adjustements

File:

• branches/proxy/src/lib/network/synchronizeable.cc (modified) (1 diff)

branches/proxy/src/lib/network/synchronizeable.cc

@@ -426 +426 @@
                SharedNetworkData::getInstance()->isClient()) {
       hasPermission = true; b6 = true; }
-    else if(  (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isUserClient( userId) &&
+    else if(  (*it)->checkPermission( PERMISSION_SERVER ) &&
+                !SharedNetworkData::getInstance()->isUserClient( userId) &&
                 !SharedNetworkData::getInstance()->isClient() &&
-                !SharedNetworkData::getInstance()->isUserLocal( this->owner) && this->owner !=  SharedNetworkData::getInstance()->getHostID()) {
+                !(SharedNetworkData::getInstance()->isUserLocal( this->owner) || this->owner ==  SharedNetworkData::getInstance()->getHostID())) {
       hasPermission = true; b7 = true; }
-
-
-#if 0
-
-    // i am SERVER && reciever == SERVER && reciever != owner && ( owner is local || i am owner)
-        else if( (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isClient() &&
-                   userId != this->owner &&
-                   ( SharedNetworkData::getInstance()->isUserLocal( userId) || this->owner ==  SharedNetworkData::getInstance()->getHostID())) {
-          hasPermission = true; b6 = true; }
-#endif