Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7697 in orxonox.OLD for branches/network


Ignore:
Timestamp:
May 18, 2006, 4:33:15 PM (19 years ago)
Author:
rennerc
Message:

fixed spaceship permissions

Location:
branches/network/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/network/src/lib/network/message_manager.cc

    r7693 r7697  
    202202 
    203203 
    204   for ( std::list<NetworkMessage>::iterator it = incomingMessabeBuffer.begin(); it != incomingMessabeBuffer.end(); it++ )
    205   {
    206     if ( (*(messageHandlerMap[it->messageId].cb))( it->messageId, data + i, it->length, messageHandlerMap[it->messageId].someData, it->number ) )
     204  for ( std::list<NetworkMessage>::iterator it = incomingMessabeBuffer.begin(); it != incomingMessabeBuffer.end(); )
     205  {
     206    if ( (*(messageHandlerMap[it->messageId].cb))( it->messageId, it->data, it->length, messageHandlerMap[it->messageId].someData, it->number ) )
    207207    {
    208208      std::list<NetworkMessage>::iterator delIt = it;
     209      if ( it->data )
     210        delete it->data;
    209211      it++;
    210212      incomingMessabeBuffer.erase( delIt );
  • branches/network/src/lib/network/network_game_manager.cc

    r7694 r7697  
    5353  this->setClassID(CL_NETWORK_GAME_MANAGER, "NetworkGameManager");
    5454
    55   hasRequestedWorld = false;
    5655  this->setSynchronized(true);
     56 
     57  MessageManager::getInstance()->registerMessageHandler( MSGID_YOU_ARE, youAreHandler, NULL );
    5758}
    5859
     
    682683      } else
    683684      {
    684         PRINTF(1)("UniqueID is not a Playable\n");
     685        PRINTF(1)("UniqueID %d is not a Playable\n", uniqueID);
    685686      }
    686687    }
     
    943944    if ( (*it)->getUniqueID()==uniqueId )
    944945    {
    945       if ( (*it)->isA( CL_PLAYABLE ) )
    946       {
    947         break;
    948       }
     946      break;
    949947    }
    950948  }
    951949 
    952   if ( it !=NetworkGameManager::getInstance()->networkStream->getSyncEnd() )
     950  if ( it == NetworkGameManager::getInstance()->networkStream->getSyncEnd() )
    953951    return false;
    954952 
  • branches/network/src/lib/network/network_game_manager.h

    r7693 r7697  
    121121#endif
    122122    static NetworkGameManager*    singletonRef;
    123     bool                          hasRequestedWorld;
    124123};
    125124
  • branches/network/src/world_entities/space_ships/space_ship.cc

    r7444 r7697  
    222222 
    223223  registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity" ) );
    224   registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mousedir" ) );
    225 
    226   registerVar( new SynchronizeableBool( &bUp, &bUp, "bUp" ) );
    227   registerVar( new SynchronizeableBool( &bDown, &bDown, "bDown" ) );
    228   registerVar( new SynchronizeableBool( &bLeft, &bLeft, "bLeft" ) );
    229   registerVar( new SynchronizeableBool( &bRight, &bRight, "bRight" ) );
    230   registerVar( new SynchronizeableBool( &bAscend, &bAscend, "bAscend" ) );
    231   registerVar( new SynchronizeableBool( &bDescend, &bDescend, "bDescend" ) );
    232   registerVar( new SynchronizeableBool( &bRollL, &bRollL, "bRollL" ) );
    233   registerVar( new SynchronizeableBool( &bRollR, &bRollR, "bRollR" ) );
     224  registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mousedir", PERMISSION_OWNER ) );
     225
     226  registerVar( new SynchronizeableBool( &bUp, &bUp, "bUp", PERMISSION_OWNER ) );
     227  registerVar( new SynchronizeableBool( &bDown, &bDown, "bDown", PERMISSION_OWNER ) );
     228  registerVar( new SynchronizeableBool( &bLeft, &bLeft, "bLeft", PERMISSION_OWNER ) );
     229  registerVar( new SynchronizeableBool( &bRight, &bRight, "bRight", PERMISSION_OWNER ) );
     230  registerVar( new SynchronizeableBool( &bAscend, &bAscend, "bAscend", PERMISSION_OWNER ) );
     231  registerVar( new SynchronizeableBool( &bDescend, &bDescend, "bDescend", PERMISSION_OWNER ) );
     232  registerVar( new SynchronizeableBool( &bRollL, &bRollL, "bRollL", PERMISSION_OWNER ) );
     233  registerVar( new SynchronizeableBool( &bRollR, &bRollR, "bRollR", PERMISSION_OWNER ) );
    234234}
    235235
Note: See TracChangeset for help on using the changeset viewer.