Changeset 9988 in orxonox.OLD for branches/coll_rect/src/lib/collision_reaction/cr_engine.cc

Timestamp:

Dec 3, 2006, 4:55:19 PM (17 years ago)

Author:

patrick

Message:

removed most of the compiler bugs. more to come

File:

• branches/coll_rect/src/lib/collision_reaction/cr_engine.cc (modified) (3 diffs)

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

@@ -17 +17 @@
 
 
+#include "cr_object_damage.h"
+#include "cr_physics_full_walk.h"
+#include "cr_physics_ground_walk.h"
 
 #include "collision.h"
 #include "collision_event.h"
 #include "collision_filter.h"
+#include "collision_tube.h"
 #include "cr_defs.h"
 
@@ -62 +66 @@
       PRINTF(0)("CollisionReaction Error: CollisionEvent cache size missmatch: %i of %i\n", this->collisionEventsUnused.size(), CR_MAX_COLLISION_EVENTS);
 
-    this->reset();
     this->flushCollisions();
 
-    CollisionList it1 = this->collisionsUnused.begin();
+    CollisionIterator it1 = this->collisionsUnused.begin();
     for(; it1 < this->collisionsUnused.end(); it1++)
       delete *it1;
-    CollisionEventList it2 = this->collisionEventsUnused.begin();
+    CollisionEventIterator it2 = this->collisionEventsUnused.begin();
     for(; it2 < this->collisionEventsUnused.end(); it2++)
       delete *it2;
@@ -146 +149 @@
     for(; ci < CollisionTube::getInstance()->end(); ++ci)
     {
-      for( int i = CREngine::CR_PHYSICS_MOMENTUM; i < CREngine::CR_NUBER; i++)
+      for( int i = CREngine::CR_PHYSICS_MOMENTUM; i < CREngine::CR_NUMBER; i++)
       {
         // check if entity A or B is subscibed for this event
-        if( (*ci)->getEntityA()->bReactibe((*it)->getEnityB(), i) || (*ci)->getEntityB()->bReactibe((*it)->getEnityA(), i))
-          (*ci)->reactToCollision(*ci);
+        if( (*ci)->getEntityA()->isReactive(*(*ci)->getEntityB(), (CREngine::ReactionType)i) ||
+            (*ci)->getEntityB()->isReactive(*(*ci)->getEntityA(), (CREngine::ReactionType)i))
+          this->_reactionList[i]->reactToCollision(*ci);
 
         (*ci)->reset();