Changeset 10744 in orxonox.OLD for branches

Timestamp:

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

Author:

bknecht

Message:

does not segfault anymore

Location:

branches/presentation/src

Files:

• util/hud.cc (modified) (1 diff)
• util/hud.h (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/creatures/fps_player.h (modified) (1 diff)

branches/presentation/src/util/hud.cc

@@ -433 +433 @@
 void Hud::removeWeaponWidget(OrxGui::GLGuiWidget* widget)
 {}
+
+void Hud::getHit()
+{
+        this->leftHit->show();
+        this->rightHit->show();
+}
 
 void Hud::updateResolution()

branches/presentation/src/util/hud.h

@@ -49 +49 @@
   void setMode(Hud::Playmode playmode);
   inline Hud::Playmode getMode() {return this->playmode;};
+
+  void getHit();
 
   void setBackGround();

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