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

Timestamp:

Nov 28, 2006, 11:54:34 PM (17 years ago)

Author:

marcscha

Message:

Modifications to ship, HUD,.. see changelog

File:

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

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

@@ -48 +48 @@
     virtual void process(const Event &event);
 
+    inline WeaponManager getWeaponManagerSecondary() { return this->secWeaponMan; };
+
     //Functions for GUI
     inline float getShieldCur() { return this->shieldCur; };        //!< returns current shield value
@@ -68 +70 @@
     void regen(float time);  //!< handler for shield and electronic regeneration
 
-    WeaponManager         primWeaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping
+    void weaponRegen(float time);   //!< weapon energy regeneration
+
+    //WeaponManager         weaponMan;      //!< the primary weapon manager: managing a list of energy weapons to wepaon-slot mapping
     WeaponManager         secWeaponMan;       //!< the secondary weapon manager: managing a list of special weapons to weapon-slot mapping
     short                 supportedPlaymodes; //!< What Playmodes are Supported in this Playable.
     Playable::Playmode    playmode;           //!< The current playmode.
-    bool                  bPrimFire;
     bool                  bSecFire;
 
@@ -98 +101 @@
     int         weaponEnergyUsed;
     float       weaponEnergyShare;
+    float       weaponEnergyRegen;
     int         weaponSpecialSlot;  //!< number of special weapon slots
     int         weaponSpecialUsed;
 
-    int         reactorOutput;      //!< reactor output
-    int         reactorCapacity;    //!< reactor capacity
-
+    float       reactorOutput;      //!< reactor output 
+    float       reactorCapacity;    //!< reactor capacity
 
     int         curWeaponPrimary;   //!< current primary weapon config