Changeset 7955 in orxonox.OLD for branches/cr/src

Timestamp:

May 29, 2006, 3:32:45 PM (18 years ago)

Author:

patrick

Message:

network: removed old network branche

Location:

branches/cr/src

Files:

• lib/collision_reaction/collision.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

branches/cr/src/lib/collision_reaction/collision.cc

@@ -24 +24 @@
 /**
  *  standard constructor
-*/
+ */
 Collision::Collision ()
 {
@@ -36 +36 @@
 /**
  *  standard deconstructor
-
-*/
+ */
 Collision::~Collision ()
 {

branches/cr/src/world_entities/world_entity.cc

@@ -296 +296 @@
   // create a collision event
   Collision* c = CREngine::getInstance()->popCollisionObject();
+  assert(c != NULL);
   c->collide(entityA, entityB, bvA, bvB);