Changeset 8854 in orxonox.OLD for branches/multi_player_map/src/world_entities/world_entity.cc

Timestamp:

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

Author:

patrick

Message:

multiplayer: kill and hit event extended for event tracing

File:

• branches/multi_player_map/src/world_entities/world_entity.cc (modified) (2 diffs)

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));
   }
 }