- 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.cc
r3110 r3196 30 30 31 31 #include "core/CoreIncludes.h" 32 #include "core/Executor.h" 32 33 #include "core/XMLPort.h" 33 #include "objects/weaponsystem/projectiles/ParticleProjectile.h"34 34 #include "objects/worldentities/Model.h" 35 36 #include "objects/weaponsystem/projectiles/Projectile.h" 35 37 #include "objects/weaponsystem/MuzzleFlash.h" 36 37 38 #include "objects/weaponsystem/Weapon.h" 38 39 #include "objects/weaponsystem/WeaponPack.h" … … 69 70 { 70 71 this->material_ = material; 71 }72 73 std::string& EnergyDrink::getMaterial()74 {75 return this->material_;76 72 } 77 73
Note: See TracChangeset
for help on using the changeset viewer.