Changeset 9995 in orxonox.OLD for branches/coll_rect/src

Timestamp:

Dec 3, 2006, 6:26:47 PM (18 years ago)

Author:

patrick

Message:

first element init problem

File:

• branches/coll_rect/src/lib/collision_reaction/collision_tube.cc (modified) (2 diffs)

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

@@ -72 +72 @@
 
     // 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))
+    if( collision == NULL || !collision->match(*entityA, *entityB))
     {
       collision = CREngine::getInstance()->popCollisionObject();
@@ -103 +103 @@
 
     // check if there is already a collision defined between these objects
-    if( collision != NULL && !collision->match(*entity, *groundEntity))
+    if( collision == NULL || !collision->match(*entity, *groundEntity))
     {
       // get a new collision object