Changeset 8855 for code/trunk/src/modules/weapons/munitions
- Timestamp:
- Aug 22, 2011, 3:05:26 PM (13 years ago)
- Location:
- code/trunk/src/modules/weapons/munitions
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/src/modules/weapons/munitions/FusionMunition.cc
r5781 r8855 27 27 */ 28 28 29 /** 30 @file FusionMunition.h 31 @brief Implementation of the FusionMunition class. 32 */ 33 29 34 #include "FusionMunition.h" 30 35 #include "core/CoreIncludes.h" -
code/trunk/src/modules/weapons/munitions/FusionMunition.h
r5781 r8855 27 27 */ 28 28 29 /** 30 @file FusionMunition.h 31 @brief Definition of the FusionMunition class. 32 */ 33 29 34 #ifndef _FusionMunition_H__ 30 35 #define _FusionMunition_H__ … … 35 40 namespace orxonox 36 41 { 42 43 /** 44 @brief 45 FusionMunition. 46 @author 47 Martin Polak 48 @ingroup WeaponsMunitions 49 */ 37 50 class _WeaponsExport FusionMunition : public Munition 38 51 { -
code/trunk/src/modules/weapons/munitions/LaserMunition.cc
r5781 r8855 27 27 */ 28 28 29 /** 30 @file LaserMunition.h 31 @brief Implementation of the LaserMunition class. 32 */ 33 29 34 #include "LaserMunition.h" 30 35 #include "core/CoreIncludes.h" … … 48 53 this->bAllowMultiMunitionRemovementUnderflow_ = true; 49 54 50 this->replenishInterval l_ = 0.5f;55 this->replenishInterval_ = 0.5f; 51 56 this->replenishMunitionAmount_ = 1; 52 57 } -
code/trunk/src/modules/weapons/munitions/LaserMunition.h
r5781 r8855 27 27 */ 28 28 29 /** 30 @file LaserMunition.h 31 @brief Definition of the LaserMunition class. 32 */ 33 29 34 #ifndef _LaserMunition_H__ 30 35 #define _LaserMunition_H__ … … 35 40 namespace orxonox 36 41 { 42 43 /** 44 @brief 45 LaserMunition. 46 @author 47 Martin Polak 48 @ingroup WeaponsMunitions 49 */ 37 50 class _WeaponsExport LaserMunition : public ReplenishingMunition 38 51 { -
code/trunk/src/modules/weapons/munitions/ReplenishingMunition.cc
r8729 r8855 27 27 */ 28 28 29 /** 30 @file ReplenishingMunition.h 31 @brief Implementation of the ReplenishingMunition class. 32 */ 33 29 34 #include "ReplenishingMunition.h" 30 35 … … 40 45 RegisterObject(ReplenishingMunition); 41 46 42 this->replenishInterval l_ = 1.0f;47 this->replenishInterval_ = 1.0f; 43 48 this->replenishMunitionAmount_ = 1; 44 49 … … 52 57 { 53 58 // Initialize the timer 54 this->replenishingTimer_.setTimer(this->replenishInterval l_, true, createExecutor(createFunctor(&ReplenishingMunition::replenish, this)));59 this->replenishingTimer_.setTimer(this->replenishInterval_, true, createExecutor(createFunctor(&ReplenishingMunition::replenish, this))); 55 60 } 56 61 -
code/trunk/src/modules/weapons/munitions/ReplenishingMunition.h
r5929 r8855 27 27 */ 28 28 29 /** 30 @file ReplenishingMunition.h 31 @brief Definition of the ReplenishingMunition class. 32 */ 33 29 34 #ifndef _ReplenishingMunition_H__ 30 35 #define _ReplenishingMunition_H__ … … 37 42 namespace orxonox 38 43 { 44 45 /** 46 @brief 47 Munition that is replenished by a certain amount each time interval. 48 @author 49 Fabian 'x3n' Landau 50 @ingroup WeaponsMunitions 51 */ 39 52 class _WeaponsExport ReplenishingMunition : public Munition 40 53 { … … 44 57 45 58 protected: 46 float replenishInterval l_;47 unsigned int replenishMunitionAmount_; 59 float replenishInterval_; //!< The interval in which the munition is replenished. 60 unsigned int replenishMunitionAmount_; //!< The amount by which it is replenished. 48 61 49 62 private: … … 51 64 void initializeTimer(); 52 65 53 Timer replenishingTimer_; 66 Timer replenishingTimer_; //!< Timer to do the replenishing. 54 67 }; 55 68 } -
code/trunk/src/modules/weapons/munitions/RocketMunition.cc
r7896 r8855 27 27 */ 28 28 29 /** 30 @file RocketMunition.h 31 @brief Implementation of the RocketMunition class. 32 */ 33 29 34 #include "RocketMunition.h" 30 35 #include "core/CoreIncludes.h" -
code/trunk/src/modules/weapons/munitions/RocketMunition.h
r7846 r8855 27 27 */ 28 28 29 /** 30 @file RocketMunition.h 31 @brief Definition of the RocketMunition class. 32 */ 33 29 34 #ifndef _RocketMunition_H__ 30 35 #define _RocketMunition_H__ … … 35 40 namespace orxonox 36 41 { 42 43 /** 44 @brief 45 Munition for the Rocket. 46 @author 47 Fabian 'x3n' Landau 48 @ingroup WeaponsMunitions 49 */ 37 50 class _WeaponsExport RocketMunition : public Munition 38 51 {
Note: See TracChangeset
for help on using the changeset viewer.