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

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:

• collision_tube.h (modified) (1 diff)
• cr_engine.cc (modified) (1 diff)

branches/coll_rect/src/lib/collision_reaction/collision_tube.h

@@ -54 +54 @@
     /* Constructor/Deconstructor/Singleton Interface */
   public:
-    inline static CollisionTube* getInstance() { if( CollisionTube::instance != NULL) CollisionTube::instance = new CollisionTube(); return CollisionTube::instance; }
+    inline static CollisionTube* getInstance() { if( CollisionTube::instance == NULL) CollisionTube::instance = new CollisionTube(); return CollisionTube::instance; }
     virtual ~CollisionTube();
 

branches/coll_rect/src/lib/collision_reaction/cr_engine.cc

@@ -151 +151 @@
       for( int i = CREngine::CR_PHYSICS_MOMENTUM; i < CREngine::CR_NUMBER; i++)
       {
+        if( _reactionList[i] == NULL)
+          continue;
+
         // check if entity A or B is subscibed for this event
         if( (*ci)->getEntityA()->isReactive(*(*ci)->getEntityB(), (CREngine::ReactionType)i) ||