Changeset 7948 in orxonox.OLD

Timestamp:

May 29, 2006, 1:35:35 AM (18 years ago)

Author:

patrick

Message:

cr: cr cleanup

Location:

branches/cr/src

Files:

• lib/collision_reaction/cr_engine.cc (modified) (2 diffs)
• story_entities/game_world.cc (modified) (2 diffs)

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

@@ -50 +50 @@
 {
   CREngine::singletonRef = NULL;
+
+  if( this->cachedCollisions.size() != CR_MAX_COLLISIONS)
+    PRINTF(0)("CollisionReaction Error: cache size missmatch: %i of %i\n", this->cachedCollisions.size(), CR_NUMBER);
+
+  this->reset();
+
+  while( !this->cachedCollisions.empty())
+    delete this->cachedCollisions.front();
+  this->cachedCollisions.clear();
 }
 
@@ -70 +79 @@
 {
   // first clear all CollisionHandles
-  std::vector<CollisionHandle*>::iterator it;
-  for( it = this->collisionHandles.begin(); it != this->collisionHandles.end(); it++)
+
+  while( !this->collisionHandles.empty())
   {
-    (*it)->reset();
-    delete *it;
+    this->collisionHandles.front()->reset();
+    delete this->collisionHandles.front();
   }
   this->collisionHandles.clear();

branches/cr/src/story_entities/game_world.cc

@@ -136 +136 @@
   AnimationPlayer::getInstance();
   PhysicsEngine::getInstance();
-
+  CREngine::getInstance();
 }
 
@@ -199 +199 @@
   delete AnimationPlayer::getInstance();
   delete PhysicsEngine::getInstance();
+  delete CREngine::getInstance();
 
   State::setCurrentStoryEntity(NULL);