Changeset 8854 in orxonox.OLD

Timestamp:

Jun 28, 2006, 2:42:19 PM (18 years ago)

Author:

patrick

Message:

multiplayer: kill and hit event extended for event tracing

Location:

branches/multi_player_map/src

Files:

• lib/collision_reaction/cr_object_damage.cc (modified) (2 diffs)
• world_entities/world_entity.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (2 diffs)

branches/multi_player_map/src/lib/collision_reaction/cr_object_damage.cc

@@ -63 +63 @@
   if( collision->isEntityACollide()) {
     damage = collision->getEntityB()->getDamage();
-    collision->getEntityA()->hit(damage);
+    collision->getEntityA()->hit(damage, , collision->getEntityB());
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassName());
@@ -69 +69 @@
   if( collision->isEntityBCollide()) {
     damage = collision->getEntityA()->getDamage();
-    collision->getEntityB()->hit(damage);
+    collision->getEntityB()->hit(damage, collision->getEntityA());
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassName());

branches/multi_player_map/src/world_entities/world_entity.cc

@@ -735 +735 @@
  *  @param damage damage to be dealt
  */
-void WorldEntity::hit(float damage)
+void WorldEntity::hit(float damage, WorldEntity* killer)
 {
   this->decreaseHealth(damage);
@@ -750 +750 @@
 
     if( State::getGameRules() != NULL)
-      State::getGameRules()->registerKill(Kill(NULL, this));
+      State::getGameRules()->registerKill(Kill(killer, this));
   }
 }

branches/multi_player_map/src/world_entities/world_entity.h

@@ -94 +94 @@
   CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
 
-  virtual void hit(float damage);
+  virtual void hit(float damage, WorldEntity* killer);
   virtual void destroy();
 
@@ -184 +184 @@
   std::string             modelFileName;                   //!< model's file name
   int                     modelFileName_handle;            //!< handle for syncing var
-  
-  int                     list_write;                      //!< entity's list 
+
+  int                     list_write;                      //!< entity's list
   int                     list_handle;                     //!< handle for list changes