Changeset 10672 in orxonox.OLD for branches/vs-enhencements/src/world_entities/space_ships/space_ship.h

Timestamp:

Jun 5, 2007, 11:01:09 PM (17 years ago)

Author:

nicolasc

Message:

version bump

File:

• branches/vs-enhencements/src/world_entities/space_ships/space_ship.h (modified) (2 diffs)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.h

@@ -65 +65 @@
 
     //!< functions for XML loading
-    void setReactor(float output) {this->reactorOutput = output; };
-    void setEngine( float speedBase) {this->engineSpeedBase = speedBase; };
+    void loadReactor(float output) {this->reactorOutput = output; };
+    void loadEngine( float speedBase) {this->engineSpeedBase = speedBase; };
     void loadEnergyShare(float shield, float weapon, float engine)
         { float tmp = shield + weapon + engine; if (unlikely (tmp > 1)) { tmp = 1/tmp; }
@@ -73 +73 @@
           this->weaponEnergyShare = weapon * tmp;
           this->engineEnergyShare = engine * tmp; };
-    inline void setWeapon(float regen) { this->weaponEnergyRegen = regen; };
+    inline void loadWeapon(float regen) { this->weaponEnergyRegen = regen; };
 
     void addWeaponToSlot(int wm, int config, int slot, const std::string& weaponName);