Changeset 7999 in orxonox.OLD for branches/cr/src/lib/collision_reaction/cr_engine.cc

Timestamp:

May 30, 2006, 11:38:37 PM (19 years ago)

Author:

patrick

Message:

cr: collision/collision event creation and resycling works now

File:

• branches/cr/src/lib/collision_reaction/cr_engine.cc (modified) (2 diffs)

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

@@ -111 +111 @@
   CollisionHandle* ch = new CollisionHandle(owner, type);
   this->collisionHandles.push_back(ch);
+
+  return ch;
 }
 
@@ -157 +159 @@
 void CREngine::flushCollisions()
 {
-  vector<Collision*>::iterator it = this->collisionsUsed.begin();
-  for(; it < this->collisionsUsed.end(); it++)
-    this->collisionsUnused.push_back(*it);
+  vector<Collision*>::iterator it1 = this->collisionsUsed.begin();
+  for(; it1 < this->collisionsUsed.end(); it1++)
+    this->collisionsUnused.push_back(*it1);
+
+  vector<CollisionEvent*>::iterator it2 = this->collisionEventsUsed.begin();
+  for(; it2 < this->collisionEventsUsed.end(); it2++)
+    this->collisionEventsUnused.push_back(*it2);
 
   this->collisionsUsed.clear();