Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7954 in orxonox.OLD for trunk/src/util


Ignore:
Timestamp:
May 29, 2006, 3:28:41 PM (18 years ago)
Author:
patrick
Message:

trunk: merged the network branche back to trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/util/multiplayer_team_deathmatch.cc

    r7810 r7954  
    203203      if ( terrz < terrain->getHeight( terrx, terry ) && ss->getAbsCoor().x > -1000 )
    204204      {
    205         //PRINTF(0)("COLLLLLLIIIIIDDDDEEEE\n");
    206         ss->networkCollisionList.push_back( 1234567890 );
    207         ss->doCollideNetwork( 1234567890 );
     205        //TODO handle this
    208206      }
    209       //PRINTF(0)("x = %f, y = %f, z = %f, height = %f\n", terrx, terry, terrz, terrain->getHeight( terrx, terry ));
    210       //ss->setRelCoorSoft( ss->getAbsCoor().x, terrain->getHeight( terrx, terry )-offsety, ss->getAbsCoor().z );
     207
    211208
    212209      float dist = (dynamic_cast<Playable*>(*it)->getAbsCoor() - big_left).len();
     
    222219        if((*it)->isA(CL_SPACE_SHIP))
    223220        {
    224           dynamic_cast<SpaceShip*>(*it)->networkCollisionList.push_back(1163692);
    225           dynamic_cast<SpaceShip*>(*it)->doCollideNetwork(11636922);
     221          //TODO handle this
    226222        }
    227223      }
Note: See TracChangeset for help on using the changeset viewer.