Changeset 9483 in orxonox.OLD for branches/proxy/src/lib/network/synchronizeable.cc
- Timestamp:
- Jul 26, 2006, 10:41:33 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/synchronizeable.cc
r9474 r9483 223 223 hasPermission = true; 224 224 // SPECIAL: get write permissions if i am master server and i am able to overwrite the client stuff 225 #warning this could probably override also clients that are connected to another proxy: the master server overwrites it 225 226 else if( SharedNetworkData::getInstance()->isMasterServer() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER )) 226 227 hasPermission = true; 227 228 // SPECIAL: get write permissions if i am proxy server and i am able to overwrite the client stuff 228 // else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->owner != userId && (*it)->checkPermission( PERMISSION_OWNER )) 229 // hasPermission = true; 229 else if( SharedNetworkData::getInstance()->isProxyServerActive() && this->owner != userId && 230 (*it)->checkPermission( PERMISSION_OWNER ) && this->networkStream->isUserClient(userId)) 231 hasPermission = true; 230 232 else 231 233 hasPermission = false; … … 367 369 hasPermission = true; 368 370 // SPECIAL: get write permissions if im sending to a proxy server that does not own this sync 369 // else if( this->networkStream->isUserProxyServerActive( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER))370 //hasPermission = true;371 else if( this->networkStream->isUserProxyServerActive( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ) && SharedNetworkData::getInstance()->isClient()) 372 hasPermission = true; 371 373 else 372 374 hasPermission = false;
Note: See TracChangeset
for help on using the changeset viewer.