- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/objects/weaponsystem/weaponmodes/EnergyDrink.h
r3053 r3196 31 31 32 32 #include "OrxonoxPrereqs.h" 33 34 #include <string> 35 #include "tools/Timer.h" 33 36 #include "objects/weaponsystem/WeaponMode.h" 34 #include "tools/Timer.h"35 37 36 38 namespace orxonox … … 47 49 private: 48 50 void setMaterial(const std::string& material); 49 std::string& getMaterial(); 51 inline const std::string& getMaterial() 52 { return this->material_; } 50 53 void setDelay(float d); 51 54 float getDelay() const;
Note: See TracChangeset
for help on using the changeset viewer.