Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9993 in orxonox.OLD for branches/coll_rect/src/lib


Ignore:
Timestamp:
Dec 3, 2006, 5:57:59 PM (18 years ago)
Author:
patrick
Message:

removed some segfaults

Location:
branches/coll_rect/src/lib/collision_reaction
Files:
2 edited

Legend:

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

    r9988 r9993  
    5454    /* Constructor/Deconstructor/Singleton Interface */
    5555  public:
    56     inline static CollisionTube* getInstance() { if( CollisionTube::instance != NULL) CollisionTube::instance = new CollisionTube(); return CollisionTube::instance; }
     56    inline static CollisionTube* getInstance() { if( CollisionTube::instance == NULL) CollisionTube::instance = new CollisionTube(); return CollisionTube::instance; }
    5757    virtual ~CollisionTube();
    5858
  • branches/coll_rect/src/lib/collision_reaction/cr_engine.cc

    r9988 r9993  
    151151      for( int i = CREngine::CR_PHYSICS_MOMENTUM; i < CREngine::CR_NUMBER; i++)
    152152      {
     153        if( _reactionList[i] == NULL)
     154          continue;
     155
    153156        // check if entity A or B is subscibed for this event
    154157        if( (*ci)->getEntityA()->isReactive(*(*ci)->getEntityB(), (CREngine::ReactionType)i) ||
Note: See TracChangeset for help on using the changeset viewer.