Changeset 7933 in orxonox.OLD for branches/cr/src/world_entities

Timestamp:

May 28, 2006, 9:37:55 PM (19 years ago)

Author:

patrick

Message:

cr: more registration framework

Location:

branches/cr/src/world_entities

Files:

• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (2 diffs)

branches/cr/src/world_entities/world_entity.cc

@@ -34 +34 @@
 #include "cr_engine.h"
 #include "collision_handle.h"
+
+#include <stdarg.h>
 
 
@@ -239 +241 @@
  *  @param ... the targets as classIDs
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, ...)
+void WorldEntity::subscribeReaction(CREngine::CRType type, int nrOfTargets, long target...)
 {
 
@@ -245 +247 @@
 
   va_list itemlist;
-  va_start (itemlist, CREngine::CRType);
+  va_start (itemlist, target);
   for (int i = 0; i < nrOfTargets; i++)
-    this->collisionHandles[type].push_back(va_arg(itemlist, long));
+    this->collisionHandles[type]->addTarget(va_arg(itemlist, long));
   va_end(itemlist);
 }

branches/cr/src/world_entities/world_entity.h

@@ -15 +15 @@
 #include "glincl.h"
 #include <vector>
-#include <stdarg.h>
+
 
 
@@ -68 +68 @@
 
   /* --- Collision Reaction Block --- */
-  void subscribeReaction(CREngine::CRType type, int nrOfTargets, ...);
+  void subscribeReaction(CREngine::CRType type, int nrOfTargets, long target, ...);