Changeset 3185 for code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h

Timestamp:

Jun 16, 2009, 12:35:20 PM (16 years ago)

Author:

rgrieder

Message:

Cleanup in the weapon system.

File:

• code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h (modified) (2 diffs)

code/branches/pch/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
+
+#include <string>
+#include "tools/Timer.h"
 #include "objects/weaponsystem/WeaponMode.h"
-#include "tools/Timer.h"
 
 namespace orxonox
@@ -47 +49 @@
         private:
             void setMaterial(const std::string& material);
-            std::string& getMaterial();
+            inline const std::string& getMaterial()
+                { return this->material_; }
             void setDelay(float d);
             float getDelay() const;