Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9995 in orxonox.OLD for branches


Ignore:
Timestamp:
Dec 3, 2006, 6:26:47 PM (18 years ago)
Author:
patrick
Message:

first element init problem

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/coll_rect/src/lib/collision_reaction/collision_tube.cc

    r9994 r9995  
    7272
    7373    // check if there is already a collision defined between these objects or this is the first collision at all
    74     if( collision != NULL || !collision->match(*entityA, *entityB))
     74    if( collision == NULL || !collision->match(*entityA, *entityB))
    7575    {
    7676      collision = CREngine::getInstance()->popCollisionObject();
     
    103103
    104104    // check if there is already a collision defined between these objects
    105     if( collision != NULL && !collision->match(*entity, *groundEntity))
     105    if( collision == NULL || !collision->match(*entity, *groundEntity))
    106106    {
    107107      // get a new collision object
Note: See TracChangeset for help on using the changeset viewer.