Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6753 in orxonox.OLD for trunk/src/world_entities/space_ships


Ignore:
Timestamp:
Jan 26, 2006, 1:08:23 AM (19 years ago)
Author:
patrick
Message:

trunk: merged network back to trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/space_ships/space_ship.cc

    r6737 r6753  
    289289  this->weaponAction();
    290290
    291   if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner()==this->getHostID() )
     291  if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
    292292   {
    293293    if (xMouse > controlVelocityX) xMouse = controlVelocityX;
     
    555555      SYNCHELP_READ_INT( flags );
    556556
    557       //bUp = (flags & MASK_bUp) != 0;
    558       //bDown = (flags & MASK_bDown) != 0;
    559       //bLeft = (flags & MASK_bLeft) != 0;
    560       //bRight = (flags & MASK_bRight) != 0;
    561       //bAscend = (flags & MASK_bAscend) != 0;
    562       //bDescend = (flags & MASK_bDescend) != 0;
    563       //bFire = (flags & MASK_bFire) != 0;
    564       //bRollL = (flags & MASK_bRollL) != 0;
    565       //bRollR = (flags & MASK_bRollR) != 0;
     557      bUp = (flags & MASK_bUp) != 0;
     558      bDown = (flags & MASK_bDown) != 0;
     559      bLeft = (flags & MASK_bLeft) != 0;
     560      bRight = (flags & MASK_bRight) != 0;
     561      bAscend = (flags & MASK_bAscend) != 0;
     562      bDescend = (flags & MASK_bDescend) != 0;
     563      bFire = (flags & MASK_bFire) != 0;
     564      bRollL = (flags & MASK_bRollL) != 0;
     565      bRollR = (flags & MASK_bRollR) != 0;
    566566
    567567    }
     
    570570    if ( b == DATA_mouse /*&& this->getHostID()!=this->getOwner()*/ )
    571571    {
    572       float asdf;
    573       SYNCHELP_READ_FLOAT( asdf );
    574       SYNCHELP_READ_FLOAT( asdf );
    575       SYNCHELP_READ_FLOAT( asdf );
    576       SYNCHELP_READ_FLOAT( asdf );
    577       //SYNCHELP_READ_FLOAT( mouseDir.w );
    578       //SYNCHELP_READ_FLOAT( mouseDir.v.x );
    579       //SYNCHELP_READ_FLOAT( mouseDir.v.y );
    580       //SYNCHELP_READ_FLOAT( mouseDir.v.z );
     572      SYNCHELP_READ_FLOAT( mouseDir.w );
     573      SYNCHELP_READ_FLOAT( mouseDir.v.x );
     574      SYNCHELP_READ_FLOAT( mouseDir.v.y );
     575      SYNCHELP_READ_FLOAT( mouseDir.v.z );
    581576    }
    582577  } while( b != 0 );
Note: See TracChangeset for help on using the changeset viewer.