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

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.h (modified) (2 diffs)

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

@@ -31 +31 @@
     ObjectListDeclaration(CREngine);
 
+    typedef std::vector<CollisionEvent*>             CollisionEventVector;
+    typedef std::vector<Collision*>                  CollisionVector;
     typedef std::vector<Collision*>::iterator        CollisionIterator;
     typedef std::vector<CollisionEvent*>::iterator   CollisionEventIterator;
@@ -90 +92 @@
     static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)
 
-    std::vector<Collision*>             collisionsUsed;           //!< a list of used, cached collisions
-    std::vector<Collision*>             collisionsUnused;         //!< a list of unused, cached collisions
+    CollisionVector                     collisionsUsed;           //!< a list of used, cached collisions
+    CollisionVector                     collisionsUnused;         //!< a list of unused, cached collisions
 
-    std::vector<CollisionEvent*>        collisionEventsUsed;      //!< a list of used, cached collision events
-    std::vector<CollisionEvent*>        collisionEventsUnused;    //!< a list of unused, cached collision events
+    CollisionEventVector                collisionEventsUsed;      //!< a list of used, cached collision events
+    CollisionEventVector                collisionEventsUnused;    //!< a list of unused, cached collision events
 
     CollisionReaction*                  _reactionList[CREngine::CR_NUMBER];  //!< the collision reaction list containing all reactions types