Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9907 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Oct 28, 2006, 10:52:35 PM (18 years ago)
Author:
rennerc
Message:

less debug - network seems to work again

Location:
branches/network/src
Files:
7 edited

Legend:

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

    r9906 r9907  
    11931193          }
    11941194          else
    1195             ; /// FIXME CLASS_ID :: b = Factory::fabricate( leafClassId );
    1196           b = Factory::fabricate( ObjectListBase::retrieveIdentity( leafClassId )  );
     1195                  b = Factory::fabricate( ObjectListBase::retrieveIdentity( leafClassId ) );
     1196         
    11971197          if ( !b )
    11981198          {
  • branches/network/src/lib/network/synchronizeable.cc

    r9906 r9907  
    271271//       PRINTF(0)("sending %s %d\n", (*it)->getName().c_str(), n);
    272272
    273 //       if( this->isA(CL_PLAYABLE))
     273//       if( this->isA( Playable::staticClassID() ))
    274274//       {
    275275//         PRINTF(0)("ms: %i, ps: %i, c: %i, sender: %i, reciever: %i, owner: %i, perm: (ow %i, ms %i, s %i, a %i)\n",
     
    457457      //(*it)->debug();
    458458
    459 //       if( this->isA(CL_PLAYABLE))
     459//       if( this->isA(Playable::staticClassID()))
    460460//       {
    461461//         PRINTF(0)("ms: %i, ps: %i, c: %i, sender: %i, reciever: %i, owner: %i, perm: (ow %i, ms %i, s %i, a %i)\n",
  • branches/network/src/lib/network/synchronizeable_var/synchronizeable_classid.cc

    r9906 r9907  
    4747{
    4848  int res = Converter::intToByteArray( vPtrIn->getLeafClassID().id(), buf, maxLength );
    49   printf( "%s has id %d\n", vPtrIn->getClassName().c_str(), vPtrIn->getLeafClassID().id() );
    5049
    5150  assert( res == INTSIZE );
  • branches/network/src/util/game_rules.cc

    r9869 r9907  
    6565    PRINTF(4)("Adding Mission Goal:%s\n", element->Value());
    6666    BaseObject* created = Factory::fabricate(element);
    67     if (created != NULL /*&& created->isA(CL_GAME_RULES)*/)
     67    if (created != NULL /*&& created->isA(GameRules::staticClassID())*/)
    6868    {
    6969      MissionGoal* mg = dynamic_cast<MissionGoal*>(created);
  • branches/network/src/util/multiplayer_team_deathmatch.cc

    r9869 r9907  
    499499
    500500  assert( bo != NULL );
    501   assert( bo->isA( CL_PLAYABLE ) );
     501  assert( bo->isA( Playable::staticClassID() ) );
    502502
    503503  Playable & playable = *(dynamic_cast<Playable*>(bo));
  • branches/network/src/world_entities/power_ups/laser_power_up.cc

    r9869 r9907  
    8080{
    8181 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
    82  if (entity->isA(CL_PLAYABLE))
     82  if (entity->isA(Playable::staticClassID()))
    8383  this->toList(OM_DEAD);
    8484}
  • branches/network/src/world_entities/power_ups/turret_power_up.cc

    r9869 r9907  
    7676{
    7777 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
    78  if (entity->isA(CL_PLAYABLE))
     78  if (entity->isA(Playable::staticClassID()))
    7979   this->toList(OM_DEAD);
    8080}
Note: See TracChangeset for help on using the changeset viewer.