Changeset 11060 for code/branches/cpp11_v3/src/orxonox/items

Timestamp:

Jan 13, 2016, 10:40:06 PM (9 years ago)

Author:

landauf

Message:

made some functions non-virtual

Location:

code/branches/cpp11_v3/src/orxonox/items

Files:

• ShipPart.cc (modified) (1 diff)
• ShipPart.h (modified) (1 diff)

code/branches/cpp11_v3/src/orxonox/items/ShipPart.cc

@@ -182 +182 @@
     }
 
-    void ShipPart::setDamageAbsorption(float value)
-    {
-        this->damageAbsorption_ = value;
-    }
-
     void ShipPart::setParent(ModularSpaceShip* ship)
     {
         this->parent_ = ship;
-    }
-
-    /**
-    @brief
-        Sets the health of the ShipPart.
-    */
-    void ShipPart::setHealth(float health)
-    {
-        this->health_ = health;
     }
 

code/branches/cpp11_v3/src/orxonox/items/ShipPart.h

@@ -64 +64 @@
             PartDestructionEvent* getDestructionEvent(unsigned int index);
 
-            virtual void setDamageAbsorption(float value);
-            inline float getDamageAbsorption()
+            inline void setDamageAbsorption(float value)
+                { this->damageAbsorption_ = value; }
+            inline float getDamageAbsorption() const
                 { return this->damageAbsorption_; }
 
             void setParent(ModularSpaceShip* ship);
-            inline ModularSpaceShip* getParent()
+            inline ModularSpaceShip* getParent() const
                 { return this->parent_; }
 
             inline void setEventExecution(bool var)
                 { this->eventExecution_ = var; }
-            inline bool isEventExecution()
+            inline bool isEventExecution() const
                 { return this->eventExecution_; }
 
-            virtual void setHealth(float health);
+            inline void setHealth(float health)
+                { this->health_ = health; }
             inline void addHealth(float health)
                 { this->setHealth(this->health_ + health); }