Changeset 10744 in orxonox.OLD for branches/presentation/src/world_entities

Timestamp:

Jun 20, 2007, 9:03:02 PM (18 years ago)

Author:

bknecht

Message:

does not segfault anymore

Location:

branches/presentation/src/world_entities/creatures

Files:

• fps_player.cc (modified) (1 diff)
• fps_player.h (modified) (1 diff)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -212 +212 @@
 {
   Playable::loadParams(root);
+}
+
+void FPSPlayer::hit(float damage, WorldEntity* killer)
+{
+        WorldEntity::hit(damage, killer);
+        if (this->hasPlayer())
+                this->getCurrentPlayer()->hud().getHit();
 }
 

branches/presentation/src/world_entities/creatures/fps_player.h

@@ -31 +31 @@
 
     virtual void reset();
+
+    virtual void hit(float damage, WorldEntity* killer);
 
     virtual void destroy(WorldEntity* killer);