Changeset 10749 in orxonox.OLD for branches/presentation/src/world_entities/space_ships/space_ship.h

Timestamp:

Jun 20, 2007, 10:29:13 PM (17 years ago)

Author:

rennerc

Message:

die player die

File:

• branches/presentation/src/world_entities/space_ships/space_ship.h (modified) (6 diffs)

branches/presentation/src/world_entities/space_ships/space_ship.h

@@ -13 +13 @@
 #include "extendable.h"
 #include "world_entity.h"
+
+#include "glgui.h"
 
 // Forward Declaration
@@ -43 +45 @@
     //void setAirFriction(float friction) { this->airFriction = friction; };
 
+    virtual void hit(float damage, WorldEntity* killer);
+    virtual void destroy( WorldEntity* killer );
+    
     virtual void enter();
     virtual void leave();
@@ -51 +56 @@
     virtual void leftWorld();
 
-    virtual void destroy(WorldEntity* killer);
     virtual void respawn();
 
@@ -79 +83 @@
     inline PNode* getTravelNode() { return this->travelNode; };
 
-    //damage handler
-    virtual void damage(float pDamage, float eDamage);  //!< pDamage physical damage, eDamage electronic damage
 
     //included by Michel: 
@@ -90 +92 @@
     virtual void movement (float dt);
 
-
-
     void nextWeaponConfig();
     void previousWeaponConfig();
-
-    virtual void hit(float damage, WorldEntity* killer);
-
+    
     void setCameraDistance(float dist);
 
@@ -221 +219 @@
     Trail*                trailR;              //!< Burst trail
 */
+    OM_LIST myList;
+    OrxGui::GLGuiBox* deadBox;
+    void onButtonContinue();
+    void onButtonExit();
+    void showDeadScreen();
 
 };