- Timestamp:
- Apr 18, 2009, 6:14:52 PM (15 years ago)
- Location:
- code/branches/weapons/src/orxonox/objects/weaponSystem/munitions
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt
r2893 r2918 1 1 ADD_SOURCE_FILES(ORXONOX_SRC_FILES 2 ReplenishingMunition.cc 2 3 LaserGunMunition.cc 3 4 FusionMunition.cc -
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc
r2912 r2918 40 40 RegisterObject(FusionMunition); 41 41 42 //default if not defined in XML 43 this->maxBullets_ = 10; 44 this->maxMagazines_ = 100; 42 this->maxMunitionPerMagazine_ = 10; 43 this->maxMagazines_ = 10; 44 this->magazines_ = 10; 45 46 this->bUseSeparateMagazines_ = true; 47 this->bStackMunition_ = false; 48 this->reloadTime_ = 1.0f; 49 50 this->bAllowMunitionRefilling_ = true; 51 this->bAllowMultiMunitionRemovementUnderflow_ = true; 45 52 } 46 47 FusionMunition::~FusionMunition()48 {49 }50 51 void FusionMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)52 {53 54 }55 56 53 } -
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/FusionMunition.h
r2912 r2918 39 39 public: 40 40 FusionMunition(BaseObject* creator); 41 virtual ~FusionMunition(); 42 43 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 44 45 46 private: 47 48 41 virtual ~FusionMunition() {} 49 42 }; 50 43 } -
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc
r2912 r2918 36 36 CreateFactory(LaserGunMunition); 37 37 38 LaserGunMunition::LaserGunMunition(BaseObject* creator) : Munition(creator)38 LaserGunMunition::LaserGunMunition(BaseObject* creator) : ReplenishingMunition(creator) 39 39 { 40 40 RegisterObject(LaserGunMunition); 41 41 42 //default if not defined in XML 43 this->maxBullets_ = 40; 44 this->maxMagazines_ = 100; 42 this->maxMunitionPerMagazine_ = 20; 43 this->maxMagazines_ = 1; 44 this->magazines_ = 1; 45 46 this->bUseSeparateMagazines_ = false; 47 this->bStackMunition_ = true; 48 49 this->bAllowMunitionRefilling_ = true; 50 this->bAllowMultiMunitionRemovementUnderflow_ = true; 51 52 this->replenishIntervall_ = 0.5f; 53 this->replenishMunitionAmount_ = 1; 45 54 } 46 47 LaserGunMunition::~LaserGunMunition()48 {49 }50 51 void LaserGunMunition::XMLPort(Element& xmlelement, XMLPort::Mode mode)52 {53 54 }55 56 55 } -
code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h
r2912 r2918 31 31 32 32 #include "OrxonoxPrereqs.h" 33 #include " objects/weaponSystem/Munition.h"33 #include "ReplenishingMunition.h" 34 34 35 35 namespace orxonox 36 36 { 37 class _OrxonoxExport LaserGunMunition : public Munition37 class _OrxonoxExport LaserGunMunition : public ReplenishingMunition 38 38 { 39 39 public: 40 40 LaserGunMunition(BaseObject* creator); 41 virtual ~LaserGunMunition(); 42 43 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); 44 45 46 private: 47 48 41 virtual ~LaserGunMunition() {} 49 42 }; 50 43 }
Note: See TracChangeset
for help on using the changeset viewer.