Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9630 in orxonox.OLD


Ignore:
Timestamp:
Jul 31, 2006, 1:41:56 AM (18 years ago)
Author:
patrick
Message:

logical adjustements

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/synchronizeable.cc

    r9629 r9630  
    426426               SharedNetworkData::getInstance()->isClient()) {
    427427      hasPermission = true; b6 = true; }
    428     else if(  (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isUserClient( userId) &&
     428    else if(  (*it)->checkPermission( PERMISSION_SERVER ) &&
     429                !SharedNetworkData::getInstance()->isUserClient( userId) &&
    429430                !SharedNetworkData::getInstance()->isClient() &&
    430                 !SharedNetworkData::getInstance()->isUserLocal( this->owner) && this->owner !=  SharedNetworkData::getInstance()->getHostID()) {
     431                !(SharedNetworkData::getInstance()->isUserLocal( this->owner) || this->owner ==  SharedNetworkData::getInstance()->getHostID())) {
    431432      hasPermission = true; b7 = true; }
    432 
    433 
    434 #if 0
    435 
    436     // i am SERVER && reciever == SERVER && reciever != owner && ( owner is local || i am owner)
    437         else if( (*it)->checkPermission( PERMISSION_SERVER ) && !SharedNetworkData::getInstance()->isClient() &&
    438                    userId != this->owner &&
    439                    ( SharedNetworkData::getInstance()->isUserLocal( userId) || this->owner ==  SharedNetworkData::getInstance()->getHostID())) {
    440           hasPermission = true; b6 = true; }
    441 #endif
    442433
    443434
Note: See TracChangeset for help on using the changeset viewer.