Changeset 9605 in orxonox.OLD for branches/proxy/src/lib/network/synchronizeable.cc
- Timestamp:
- Jul 29, 2006, 11:46:07 AM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/synchronizeable.cc
r9598 r9605 365 365 366 366 367 368 369 367 // * <====| MASTER_SERVER 370 368 if( this->networkStream->isUserMasterServer( userId ) && (*it)->checkPermission( PERMISSION_MASTER_SERVER )) 371 369 hasPermission = true; 372 else if( this->networkStream->isUserMasterServer( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID()373 && (*it)->checkPermission( PERMISSION_OWNER ))370 else if( this->networkStream->isUserMasterServer( userId ) && 371 this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER )) 374 372 hasPermission = true; 375 373 376 374 // * <====| PROXY_SERVER 377 else if( this->networkStream->isUserProxyServerActive( userId ) && this->owner != SharedNetworkData::getInstance()->getHostID()378 && (*it)->checkPermission( PERMISSION_OWNER ))375 else if( this->networkStream->isUserProxyServerActive( userId ) && 376 this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER )) 379 377 hasPermission = true; 380 378 // CLIENT <====| PROXY_SERVER 381 else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()382 && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_OWNER ))383 hasPermission = true;384 else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient()385 && this->owner != SharedNetworkData::getInstance()->getHostID() && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))386 hasPermission = true;387 379 else if( this->networkStream->isUserProxyServerActive( userId ) && SharedNetworkData::getInstance()->isClient() 388 380 && (*it)->checkPermission( PERMISSION_MASTER_SERVER ))
Note: See TracChangeset
for help on using the changeset viewer.