Changeset 8894 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 29, 2006, 12:19:48 AM (18 years ago)

Author:

patrick

Message:

merged the branche single_player_map with the trunk

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (4 diffs)
• creatures/fps_player.cc (modified) (3 diffs)
• door.cc (copied) (copied from branches/single_player_map/src/world_entities/door.cc)
• door.h (copied) (copied from branches/single_player_map/src/world_entities/door.h)
• npcs/generic_npc.cc (modified) (8 diffs)
• npcs/generic_npc.h (modified) (3 diffs)
• npcs/npc.cc (modified) (1 diff)
• script_trigger.cc (modified) (8 diffs)
• script_trigger.h (modified) (3 diffs)
• weapons/fps_sniper_rifle.cc (copied) (copied from branches/single_player_map/src/world_entities/weapons/fps_sniper_rifle.cc)
• weapons/fps_sniper_rifle.h (copied) (copied from branches/single_player_map/src/world_entities/weapons/fps_sniper_rifle.h)
• world_entity.cc (modified) (4 diffs)
• world_entity.h (modified) (3 diffs)

trunk/src/world_entities/WorldEntities.am

@@ -16 +16 @@
                 world_entities/character_attributes.cc \
                 world_entities/test_entity.cc \
+                world_entities/door.cc \
                 world_entities/planet.cc \
                 world_entities/bsp_entity.cc \
@@ -26 +27 @@
                 world_entities/weapons/hyperblaster.cc \
                 world_entities/weapons/aim.cc \
+                world_entities/weapons/fps_sniper_rifle.cc \
                 \
                 world_entities/projectiles/bomb.cc \
@@ -74 +76 @@
                 character_attributes.h \
                 test_entity.h \
+                door.h \
                 planet.h \
                 bsp_entity.h \
@@ -84 +87 @@
                 weapons/targeting_turret.h \
                 weapons/aim.h \
+                weapons/fps_sniper_rifle.h \
                 \
                 projectiles/bomb.h \

trunk/src/world_entities/creatures/fps_player.cc

@@ -26 +26 @@
 #include "weapons/turret.h"
 #include "weapons/cannon.h"
+#include "weapons/fps_sniper_rifle.h"
 
 #include "key_mapper.h"
@@ -35 +36 @@
 
 CREATE_FACTORY(FPSPlayer, CL_FPS_PLAYER);
+
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(FPSPlayer, CL_FPS_PLAYER,
+                        addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                            ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                            ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                            ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                       );
 
 
@@ -101 +110 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-  Weapon* wpRight = new TestGun(0);
+  Weapon* wpRight = new FPSSniperRifle(0);
   wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
+/*  Weapon* wpLeft = new TestGun(1);*/
 //   Weapon* wpLeft = new Turret();
-  wpLeft->setName("testGun Left");
-
-  this->addWeapon(wpLeft, 1, 0);
-  this->addWeapon(wpRight,1 ,1);
+//   wpLeft->setName("testGun Left");
+
+//   this->addWeapon(wpLeft, 1, 0);
+  this->addWeapon(wpRight,1, 0);
   this->getWeaponManager().changeWeaponConfig(1);
 
   this->getWeaponManager().setSlotCount(2);
-  this->getWeaponManager().setSlotPosition(0, Vector(-0.5, .2, -1.9));
+  this->getWeaponManager().setSlotPosition(0, Vector(0.0, 5.0, 0.0));
+  this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(0,1,0)));
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->getWeaponManager().setSlotPosition(1, Vector(-0.5, .2, 1.9));

trunk/src/world_entities/npcs/generic_npc.cc

@@ -38 +38 @@
 CREATE_FACTORY(GenericNPC, CL_GENERIC_NPC);
 
+#include "script_class.h"
+CREATE_SCRIPTABLE_CLASS(GenericNPC, CL_GENERIC_NPC,
+                       // Move
+                        addMethod("walkTo", ExecutorLua3ret<GenericNPC,float,float,float,float>(&GenericNPC::walkTo))
+                        ->addMethod("setTime", ExecutorLua1<GenericNPC,float>(&GenericNPC::setTime))
+                        ->addMethod("turnTo", ExecutorLua4ret<GenericNPC,bool,float,float,float,float>(&GenericNPC::turnTo))
+                       // Display
+                        ->addMethod("hide", ExecutorLua0<WorldEntity>(&WorldEntity::hide))
+                        ->addMethod("unhide", ExecutorLua0<WorldEntity>(&WorldEntity::unhide))
+                       // Coordinates
+                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("setAbsDir", ExecutorLua4<PNode,float,float,float,float>(&PNode::setAbsDir))
+                            
+                       );
+
 
 
@@ -52 +70 @@
 }
 
+
+GenericNPC::GenericNPC()
+  : NPC(NULL)
+{
+
+}
 
 /**
@@ -75 +99 @@
   this->soundBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);
 
+  time = 30.0f;
   // collision reaction registration
 //   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
@@ -136 +161 @@
 
   // check if this is the current goal
-  if( this->destCoor != destCoor && this->destDir != destDir)
+  if( this->destCoor != destCoor || this->destDir != destDir)
   {
-    this->destCoor = Vector(x, y, 0.0f);
-    this->destDir = Quaternion(Vector(qx, qy, qz), qu);
-
-    float time = 5.0f;
+    this->destCoor = destCoor;
+    this->destDir = destDir;
+
+    //float time = 100.0f;
 
     if( this->currentAnim != NULL)
@@ -147 +172 @@
 
     this->currentAnim = new Animation3D(this);
-    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f);
-    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+
+    this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
+    this->currentAnim->play();
+
+    this->setAnimation(RUN, MD2_ANIM_LOOP);
   }
 
@@ -157 +188 @@
 
 
+/**
+ * walk to a specific place with direction
+ *
+ * @param x: x coordinate to go to
+ * @param y: y coordinate to go to
+ * @param z: z coordinate to go to
+ *
+ * without turning itself
+ */
+float GenericNPC::walkTo(float x, float y, float z)
+{
+  Quaternion q = this->getAbsDir();
+
+  //printf("%s moving to %f, %f, %f \n",this->getName(),x,y,z);
+
+  return this->walkTo(x, y, z, q.w, q.v.x, q.v.y, q.v.z);
+}
 
 /**
@@ -188 +236 @@
 
 
+
+/**
+ * run to a specific place with direction
+ *
+ * @param x: x coordinate to go to
+ * @param y: y coordinate to go to
+ * @param z: z coordinate to go to
+ * @param qu: angle to rotate
+ * @param qx: x coordinate of rotation vector
+ * @param qy: y coordinate of rotation vector
+ * @param qz: z coordinate of rotation vector
+ *
+ */
+float GenericNPC::runTo(float x, float y, float z, float qu, float qx, float qy, float qz)
+{
+  Vector destCoor = Vector(x, y, z);
+  Quaternion destDir = Quaternion(Vector(qx, qy, qz), qu);
+
+  // check if this is the current goal
+  if( this->destCoor != destCoor || this->destDir != destDir)
+  {
+    this->destCoor = destCoor;
+    this->destDir = destDir;
+
+    float time = 5.0f;
+
+    if( this->currentAnim != NULL)
+      delete this->currentAnim;
+
+    this->currentAnim = new Animation3D(this);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+
+
+    this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
+    this->currentAnim->play();
+
+    this->setAnimation(RUN, MD2_ANIM_LOOP);
+  }
+
+  // calculate the distance
+  Vector distance = this->getAbsCoor() - this->destCoor;
+  return distance.len();
+}
+
+
+/**
+ * run to a specific place with direction
+ *
+ * @param x: x coordinate to go to
+ * @param y: y coordinate to go to
+ * @param qu: angle to rotate
+ * @param qx: x coordinate of rotation vector
+ * @param qy: y coordinate of rotation vector
+ * @param qz: z coordinate of rotation vector
+ *
+ */
+float GenericNPC::runTo(float x, float y, float qu, float qx, float qy, float qz)
+{
+  this->runTo(x, y, 0.0f, qu, qx, qy, qz);
+}
+
+
+/**
+ * run to a specific place with direction
+ *
+ * @param coor: vector place
+ * @param dir: direction
+ *
+ */
+float GenericNPC::runTo(const Vector& coordinate, const Quaternion& dir)
+{
+  this->runTo(coordinate.x, coordinate.y, coordinate.z, dir.w, dir.v.x, dir.v.y, dir.v.z);
+}
+
+
+/**
+ * crouch to a specific place with direction
+ *
+ * @param x: x coordinate to go to
+ * @param y: y coordinate to go to
+ * @param z: z coordinate to go to
+ * @param qu: angle to rotate
+ * @param qx: x coordinate of rotation vector
+ * @param qy: y coordinate of rotation vector
+ * @param qz: z coordinate of rotation vector
+ *
+ */
+float GenericNPC::crouchTo(float x, float y, float z, float qu, float qx, float qy, float qz)
+{
+  Vector destCoor = Vector(x, y, z);
+  Quaternion destDir = Quaternion(Vector(qx, qy, qz), qu);
+
+  // check if this is the current goal
+  if( this->destCoor != destCoor || this->destDir != destDir)
+  {
+    this->destCoor = destCoor;
+    this->destDir = destDir;
+
+
+    if( this->currentAnim != NULL)
+      delete this->currentAnim;
+
+    this->currentAnim = new Animation3D(this);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->destCoor, this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+
+
+    this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
+    this->currentAnim->play();
+
+    this->setAnimation(CROUCH_WALK, MD2_ANIM_LOOP);
+  }
+
+  // calculate the distance
+  Vector distance = this->getAbsCoor() - this->destCoor;
+  return distance.len();
+}
+
+
+/**
+ * couch to a specific place with direction
+ *
+ * @param x: x coordinate to go to
+ * @param y: y coordinate to go to
+ * @param qu: angle to rotate
+ * @param qx: x coordinate of rotation vector
+ * @param qy: y coordinate of rotation vector
+ * @param qz: z coordinate of rotation vector
+ *
+ */
+float GenericNPC::crouchTo(float x, float y, float qu, float qx, float qy, float qz)
+{
+  this->crouchTo(x, y, 0.0f, qu, qx, qy, qz);
+}
+
+
+
+/**
+ * crouch to a specific place with direction
+ *
+ * @param coor: vector place
+ * @param dir: direction
+ *
+ */
+float GenericNPC::crouchTo(const Vector& coordinate, const Quaternion& dir)
+{
+  this->crouchTo(coordinate.x, coordinate.y, coordinate.z, dir.w, dir.v.x, dir.v.y, dir.v.z);
+}
+
+
+/**
+ * stops the generic animation
+ */
+void GenericNPC::stop()
+{
+  if( this->currentAnim != NULL)
+  {
+    this->currentAnim->stop();
+    delete this->currentAnim;
+    this->currentAnim = NULL;
+
+    this->setAnimation(STAND, MD2_ANIM_LOOP);
+  }
+}
+
+
+/**
+ * lookat a world entity
+ * @param worldEntity: the worldentity to look at
+ */
+float GenericNPC::lookAt(WorldEntity* worldEntity)
+{}
+
+
+/**
+ * turns to a given direction
+ */
+bool GenericNPC::turnTo(float qu, float qx, float qy, float qz)
+{
+  Quaternion destDir = Quaternion(Vector(qx, qy, qz).getNormalized(), qu);
+
+  printf("Turning: %f, %f, %f, %f \n",qu,qx,qy,qz);
+  // check if this is the current goal
+  if( this->destDir != destDir)
+  {
+//     if( this->currentAnim != NULL)
+//       this->currentAnim->stop();
+//
+    PRINTF(0)("SET ANIMATION\n");
+    this->destDir = destDir;
+//
+
+
+    if( this->currentAnim != NULL)
+      delete this->currentAnim;
+
+    this->setAbsDir(destDir);
+/*
+    this->currentAnim = new Animation3D(this);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), 0.0f, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->getAbsDir(), time, ANIM_LINEAR, ANIM_LINEAR);
+    this->currentAnim->addKeyFrame(this->getAbsCoor(), this->destDir, time, ANIM_LINEAR, ANIM_LINEAR);
+
+
+    this->currentAnim->setInfinity(ANIM_INF_CONSTANT);
+    this->currentAnim->play();*/
+
+    this->setAnimation(STAND, MD2_ANIM_LOOP);
+  }
+
+  // calculate the distance
+  Vector distance = this->getAbsCoor() - this->destCoor;
+  return distance.len();
+}
+
+
+
+/**
+ * talk to a world entity and play a sound/music/voice
+ * @param worldEntity: entity
+ * @param dialogNr: sound nr to be played (from the xml load tags)
+ */
+float GenericNPC::talkTo(WorldEntity* worldEntity, int dialogNr)
+{}
+
+
+/**
+ * world entity to shoot at if there is any weapon on the npc
+ * @param entity: entity to shoot entity
+ */
+void GenericNPC::shootAt(WorldEntity* entity)
+{}
+
+
+
+
+
+
+
+
+
+
 /**
  * tick this world entity
@@ -196 +487 @@
   if( likely(this->getModel(0) != NULL))
     ((InteractiveModel*)this->getModel(0))->tick(time);
+
 }
 

trunk/src/world_entities/npcs/generic_npc.h

@@ -28 +28 @@
 {
  public:
+  GenericNPC();
   GenericNPC(const TiXmlElement* root);
   virtual ~GenericNPC ();
@@ -38 +39 @@
   inline void setVolume(float vol) { this->soundVolume = vol; }
 
-  void playAnimation(int animationIndex, int animPlaybackMode);
 
-  void playSound(std::string filename);
-  void playSound(int i);
+  /* npc controlling functions */
 
-  float lookAt(WorldEntity* worldEntity);
-
+  /* walking functions */
   float walkTo(const Vector& coordinate, const Quaternion& dir);
+  float walkTo(float x, float y, float z);
   float walkTo(float x, float y, float z, float qu, float qx, float qy, float qz);
   float walkTo(float x, float y, float qu, float qx, float qy, float qz);
 
+  /* running functions */
   float runTo(const Vector& coordinate, const Quaternion& dir);
   float runTo(float x, float y, float z, float qu, float qx, float qy, float qz);
   float runTo(float x, float y, float qu, float qx, float qy, float qz);
 
+  /* couching functinos */
   float crouchTo(const Vector& coordinate, const Quaternion& dir);
   float crouchTo(float x, float y, float z, float qu, float qx, float qy, float qz);
   float crouchTo(float x, float y, float qu, float qx, float qy, float qz);
 
+  /* stopping the movement */
+  void stop();
+
+  /* some oriantation functions */
+  float lookAt(WorldEntity* worldEntity);
+  bool turnTo(float qu, float qx, float qy, float qz);
+
+  /* talking funcitons*/
   float talkTo(WorldEntity* worldEntity, int dialogNr);
+
+  /* shooting functions */
+  void shootAt(WorldEntity* entity);
+
+
+  /* some generic control funtions */
+  void playAnimation(int animationIndex, int animPlaybackMode);
+  void playSound(std::string filename);
+  void playSound(int i);
+
+  void setTime(float newTime){ this->time = newTime; };
+  
+  virtual void tick (float time);
 
 
   void destroy();
-
-  virtual void tick (float time);
 
 
@@ -74 +94 @@
 
    Animation3D*                            currentAnim;
+   float                                   time;          //!< Duration of the action
 };
 

trunk/src/world_entities/npcs/npc.cc

@@ -50 +50 @@
 void NPC::loadParams(const TiXmlElement* root)
 {
-  WorldEntity::loadParams(root);
+  if(root != NULL)
+   WorldEntity::loadParams(root);
 }
 

trunk/src/world_entities/script_trigger.cc

@@ -24 +24 @@
 CREATE_SCRIPTABLE_CLASS(ScriptTrigger, CL_SCRIPT_TRIGGER,
                             addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
-                                ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
-                                ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
-                                ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                            ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                            ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                            ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
                        );
 
@@ -41 +41 @@
 
   returnCount = 1;
-  actionFinished = false;
+  scriptFinished = false;
   doDebugDraw = false;
   invert = false;
   scriptCalled = false;
   scriptIsOk = false;
-  triggerLasts = false;
+  triggerLasts = true;
   addToScript = false;
   
@@ -54 +54 @@
   loadParams(root);
   
-  if(addToScript)
+  if(addToScript && scriptIsOk)
   {
     script->addObject( "ScriptTrigger", this->getName());
@@ -102 +102 @@
         .describe("The name of the parent as it is in the *.oxw file")
         .defaultValues("");
-    LoadParam(root, "callonce", this, ScriptTrigger, setCallOnce)
-        .describe("True if the script shoul only be called once")
-        .defaultValues("");
     LoadParam(root, "invert", this, ScriptTrigger, setInvert)
         .describe("")
-        .defaultValues("");
+        .defaultValues("false");
     LoadParam(root, "triggerlasts", this, ScriptTrigger, setTriggerLasts)
         .describe("")
-        .defaultValues("");
+        .defaultValues("true");
     LoadParam(root, "debugdraw", this, ScriptTrigger, setDebugDraw)
-        .describe("True if the script should only be called once")
-        .defaultValues("");
+        .describe("")
+        .defaultValues("false");
     LoadParam(root, "addtoscript", this, ScriptTrigger, setAddToScript)
         .describe("True if this scripttrigger should be aviable in the script")
-        .defaultValues("");
+        .defaultValues("false");
 }
 
@@ -159 +156 @@
 void ScriptTrigger::tick(float timestep)
 {
-  if(actionFinished) return;
+  if(scriptFinished) return;
 
   if(triggerLasts && scriptCalled)
@@ -169 +166 @@
   if( !invert && this->distance(target) < radius)
  {
-  if(!callOnce)
-   {
     executeAction(timestep);
     scriptCalled = true;
-   }
-  else if(callOnce && !scriptCalled)
-  {
-   executeAction(timestep);
-   scriptCalled = true;
-  }
   
  }
  else if( invert && this->distance(target) > radius)
  {
-   if(!callOnce)
-   {
-     executeAction(timestep);
-   }
-   else if(callOnce && !scriptCalled)
-   {
-     executeAction(timestep);
+     executeAction(timestep); 
      scriptCalled = true;
-   }
-   
  }
  //else
@@ -202 +183 @@
 void ScriptTrigger::executeAction(float timestep)
 {
+  
      if(scriptIsOk)
      {
@@ -213 +195 @@
        printf("Error ScriptTrigger: Execution of %s in %s failed.\n",functionName.c_str(), script->getFileName().c_str());
      
-     actionFinished = script->getReturnedBool();
+     scriptFinished = script->getReturnedBool();
      }
      

trunk/src/world_entities/script_trigger.h

@@ -35 +35 @@
     void setTarget(WorldEntity* target) { if(target!=NULL) this->target=target; }
     void setTriggerParent(const std::string& name);
-    void setCallOnce(const bool call) { this->callOnce = call; }
     void setTriggerLasts(const bool lasts) { this->triggerLasts = lasts; }
     void setInvert(const bool inv) { this->invert = invert; }
@@ -51 +50 @@
 
     WorldEntity* target;
-    bool         callOnce;
     bool         triggerLasts;
     bool         invert;
@@ -63 +61 @@
     bool         scriptCalled;
     bool         scriptIsOk;
-    bool         actionFinished;
+    bool         scriptFinished;
     int          returnCount;        //TODO: set return count correctly
 

trunk/src/world_entities/world_entity.cc

@@ -193 +193 @@
         PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str());
 
-      if( modelNumber == 0)
+      if( modelNumber == 0 && !this->isA(CL_WEAPON))
         this->buildObbTree(obbTreeDepth);
     }
@@ -418 +418 @@
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(entityA, entityB, bvA, bvB);
+  c->collide(COLLISION_TYPE_OBB, entityA, entityB, bvA, bvB);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)
@@ -433 +433 @@
  *  @param position it collides on the plane
  */
-bool WorldEntity::registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position)
+bool WorldEntity::registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
 {
   // is there any handler listening?
@@ -442 +442 @@
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(entity, groundEntity, normal, position);
+  c->collide(type, entity, groundEntity, normal, position, bInWall);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)

trunk/src/world_entities/world_entity.h

@@ -88 +88 @@
 
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position);
+  bool registerCollision(int type, WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall = false);
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }
@@ -115 +115 @@
   /** @returns a Reference to the Iterator */
   ObjectManager::EntityList::iterator& getEntityIterator() { return this->objectListIterator; }
+
+  void hide() { if( this->objectListNumber != OM_DEAD) this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
+  void unhide() { this->toList(this->lastObjectListNumber); }
+
 
   /* --- Character Attribute Block --- */
@@ -176 +180 @@
   OM_LIST                 objectListNumber;                //!< The ObjectList from ObjectManager this Entity is in.
   ObjectManager::EntityList::iterator objectListIterator;  //!< The iterator position of this Entity in the given list of the ObjectManager.
+  OM_LIST                 lastObjectListNumber;            //!< the last ObjectList from the ObjectManager this Entity was is in