Changeset 9994 in orxonox.OLD for branches

Timestamp:

Dec 3, 2006, 6:24:08 PM (18 years ago)

Author:

patrick

Message:

found another two segfaults and removed them

Location:

branches/coll_rect/src/lib/collision_reaction

Files:

• collision_tube.cc (modified) (3 diffs)
• collision_tube.h (modified) (2 diffs)

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

@@ -34 +34 @@
   ObjectListDefinition(CollisionTube);
 
-  CollisionTube* CollisionTube::instance = NULL;
+  CollisionTube* CollisionTube::singletonRef = NULL;
 
 
@@ -67 +67 @@
   void CollisionTube::registerCollisionEvent(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB)
   {
-    Collision* collision = this->_collisionList.back();
+    Collision* collision = NULL;
+    if( !this->_collisionList.empty())
+      collision = this->_collisionList.back();
 
-    // check if there is already a collision defined between these objects
-    if( !collision->match(*entityA, *entityB))
+    // check if there is already a collision defined between these objects or this is the first collision at all
+    if( collision != NULL || !collision->match(*entityA, *entityB))
     {
       collision = CREngine::getInstance()->popCollisionObject();
@@ -96 +98 @@
   {
     // get last collision
-    Collision* collision = this->_collisionList.back();
+    Collision* collision = NULL;
+    if( !this->_collisionList.empty())
+      collision = this->_collisionList.back();
 
     // check if there is already a collision defined between these objects

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( !singletonRef) singletonRef = new CollisionTube(); return singletonRef; }
+
     virtual ~CollisionTube();
 
@@ -61 +62 @@
     CollisionTube(const CollisionTube& tube) {}
 
-    static CollisionTube*          instance;                         //!< the singleton instance
+    static CollisionTube*          singletonRef;                         //!< the singleton instance