Changeset 8853 in orxonox.OLD for branches/single_player_map/src/lib

Timestamp:

Jun 28, 2006, 2:36:56 PM (19 years ago)

Author:

patrick

Message:

collision interface extended

File:

• branches/single_player_map/src/lib/collision_reaction/collision_event.h (modified) (2 diffs)

branches/single_player_map/src/lib/collision_reaction/collision_event.h

@@ -25 +25 @@
   { this->entityA = entityA; this->entityB = entityB; this->bvA = bvA; this->bvB = bvB; }
   /** collides two WorldEntities @param entity world entity , @param ground ground plane, @param position position on the ground */
-  inline void collide(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position)
-  { this->entityA = entity; this->entityB = groundEntity, this->groundNormal = normal; this->position = position; }
+  inline void collide(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position, bool bInWall)
+  { this->entityA = entity; this->entityB = groundEntity, this->groundNormal = normal; this->position = position; this->bInWall = bInWall; }
 
 
@@ -53 +53 @@
   Vector            groundNormal;                  //!< the ground plane with which it collides (only for bsp-model collisions
   Vector            position;                      //!< position of the collision on the ground plane
+
+  bool              bInWall;                       //!< true if is in wall
 };