Changeset 7865 in orxonox.OLD for trunk/src

Timestamp:

May 25, 2006, 11:29:55 PM (19 years ago)

Author:

patrick

Message:

trunk: removed compiler error

Location:

trunk/src/lib/collision_reaction

Files:

• cr_engine.cc (modified) (1 diff)
• cr_engine.h (modified) (4 diffs)

trunk/src/lib/collision_reaction/cr_engine.cc

@@ -46 +46 @@
 
 
-#if 0
+
 CollisionHandle* CREngine::subscribeReaction(WorldEntity* worldEntity, CRType type, int nrOfTargets, ...)
 {
   va_list itemlist;
   va_start (itemlist, type);
-  for (int i = 0; i < faceElemCount; i++)
+  for (int i = 0; i < nrOfTargets; i++)
     this->targetList.push_back(va_arg(itemlist, int));
   va_end(itemlist);
 }
-#endif
 
 
 
+

trunk/src/lib/collision_reaction/cr_engine.h

@@ -8 +8 @@
 
 #include "base_object.h"
+#include <stdarg.h>
+#include <vector>
 
 // FORWARD DECLARATION
 class CollisionHandle;
 class Collision;
+class WorldEntity;
 
 //! A default singleton class.
 class CREngine : public BaseObject
 {
-#if 0
+
   typedef enum CRType {
     CR_CONSERVATION_OF_MOMENTUM   = 0,
@@ -29 +32 @@
     CR_NUMBER
   };
-#endif
+
 
 public:
@@ -36 +39 @@
   inline static CREngine* getInstance(void) { if (!singletonRef) singletonRef = new CREngine();  return singletonRef; };
 
-#if 0
+
   CollisionHandle* subscribeReaction(WorldEntity* worldEntity, CRType type, int nrOfTargets, ...);
 
@@ -52 +55 @@
 
 private:
+  CREngine(void);
 
+private:
   std::vector<CollisionHandle*>       collisionHandles;         //!< list with the collision handles
   std::vector<Collision*>             cachedCollisions;         //!< a list of unused, cached collision events
-#endif
-private:
-  CREngine(void);
+  std::vector<int>                    targetList;
+
   static CREngine*                    singletonRef;             //!< the reference to the CREngine object (singleton)
 };