Changeset 10120 in orxonox.OLD for branches/playability/src/world_entities/space_ships/space_ship.h

Timestamp:

Dec 20, 2006, 12:02:01 PM (17 years ago)

Author:

muellmic

Message:

some interface hacks

File:

• branches/playability/src/world_entities/space_ships/space_ship.h (modified) (4 diffs)

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

@@ -75 +75 @@
     virtual void damage(float pDamage, float eDamage);  //!< pDamage physical damage, eDamage electronic damage
 
+    //included by Michel: ((
     virtual void enterPlaymode(Playable::Playmode playmode);
-    void setPlaymodeXML(const std::string& playmode);
+    void setPlaymodeXML(const std::string& playmode); //recieves the playmode from a string (useful for script implementation)
     virtual void movement (float dt);
+
+    //))
 
     void nextWeaponConfig();
@@ -94 +97 @@
 
     inline bool systemFailure() {  return (this->electronicCur < float(rand())/float(RAND_MAX) * this->electronicTH); };
+
+    void updateElectronicWidget();
+    void updateShieldWidget();
 
     //WeaponManager         weaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping
@@ -107 +113 @@
     float       shieldTH;           //!< shield threshhold for reactivation
     bool        shieldActive;       //!< wheather the shield is working
+    OrxGui::GLGuiEnergyWidgetVertical* shieldWidget; //!< holds the widget that shows the shield bar
 
     float       armorCur;           //!< current armor
     float       armorMax;           //!< maximum armor
     float       armorRegen;         //!< armor regeneration per tick (usable on bioships?)
+    //note that the armor widget is set on the health- widget in world- entity (see in player.cc)
 
     float       electronicCur;      //!< current electronic
@@ -116 +124 @@
     float       electronicRegen;    //!< electronic regenration rate per tick
     float       electronicTH;       //!< Threshhold for electronic failure
+    OrxGui::GLGuiEnergyWidgetVertical* electronicWidget; //!< holds the widget that shows the electronic bar
 
     float       engineSpeedCur;     //!< speed output for movement = speed base + energy share part