Changeset 2920 for code/branches
- Timestamp:
- Apr 18, 2009, 6:59:02 PM (16 years ago)
- Location:
- code/branches/weapons/src/orxonox
- Files:
-
- 3 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapons/src/orxonox/OrxonoxPrereqs.h
r2918 r2920 165 165 class ReplenishingMunition; 166 166 class Munition; 167 class Laser GunMunition;167 class LaserMunition; 168 168 class FusionMunition; 169 169 -
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt
r2918 r2920 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 2 ReplenishingMunition.cc 3 Laser GunMunition.cc3 LaserMunition.cc 4 4 FusionMunition.cc 5 5 ) -
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc
r2918 r2920 28 28 29 29 #include "OrxonoxStableHeaders.h" 30 #include "Laser GunMunition.h"30 #include "LaserMunition.h" 31 31 32 32 #include "core/CoreIncludes.h" … … 34 34 namespace orxonox 35 35 { 36 CreateFactory(Laser GunMunition);36 CreateFactory(LaserMunition); 37 37 38 Laser GunMunition::LaserGunMunition(BaseObject* creator) : ReplenishingMunition(creator)38 LaserMunition::LaserMunition(BaseObject* creator) : ReplenishingMunition(creator) 39 39 { 40 RegisterObject(Laser GunMunition);40 RegisterObject(LaserMunition); 41 41 42 42 this->maxMunitionPerMagazine_ = 20; -
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h
r2918 r2920 27 27 */ 28 28 29 #ifndef _Laser GunMunition_H__30 #define _Laser GunMunition_H__29 #ifndef _LaserMunition_H__ 30 #define _LaserMunition_H__ 31 31 32 32 #include "OrxonoxPrereqs.h" … … 35 35 namespace orxonox 36 36 { 37 class _OrxonoxExport Laser GunMunition : public ReplenishingMunition37 class _OrxonoxExport LaserMunition : public ReplenishingMunition 38 38 { 39 39 public: 40 Laser GunMunition(BaseObject* creator);41 virtual ~Laser GunMunition() {}40 LaserMunition(BaseObject* creator); 41 virtual ~LaserMunition() {} 42 42 }; 43 43 } 44 44 45 #endif /* _Laser GunMunition_H__ */45 #endif /* _LaserMunition_H__ */ -
code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc
r2918 r2920 49 49 this->speed_ = 1250; 50 50 51 this->setMunitionName("Laser GunMunition");51 this->setMunitionName("LaserMunition"); 52 52 } 53 53
Note: See TracChangeset
for help on using the changeset viewer.