Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2920 for code/branches


Ignore:
Timestamp:
Apr 18, 2009, 6:59:02 PM (16 years ago)
Author:
landauf
Message:

renamed LaserGunMunition as LaserMunition

Location:
code/branches/weapons/src/orxonox
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • code/branches/weapons/src/orxonox/OrxonoxPrereqs.h

    r2918 r2920  
    165165    class ReplenishingMunition;
    166166    class Munition;
    167     class LaserGunMunition;
     167    class LaserMunition;
    168168    class FusionMunition;
    169169
  • code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt

    r2918 r2920  
    11ADD_SOURCE_FILES(ORXONOX_SRC_FILES
    22  ReplenishingMunition.cc
    3   LaserGunMunition.cc
     3  LaserMunition.cc
    44  FusionMunition.cc
    55)
  • code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc

    r2918 r2920  
    2828
    2929#include "OrxonoxStableHeaders.h"
    30 #include "LaserGunMunition.h"
     30#include "LaserMunition.h"
    3131
    3232#include "core/CoreIncludes.h"
     
    3434namespace orxonox
    3535{
    36     CreateFactory(LaserGunMunition);
     36    CreateFactory(LaserMunition);
    3737
    38     LaserGunMunition::LaserGunMunition(BaseObject* creator) : ReplenishingMunition(creator)
     38    LaserMunition::LaserMunition(BaseObject* creator) : ReplenishingMunition(creator)
    3939    {
    40         RegisterObject(LaserGunMunition);
     40        RegisterObject(LaserMunition);
    4141
    4242        this->maxMunitionPerMagazine_ = 20;
  • code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h

    r2918 r2920  
    2727 */
    2828
    29 #ifndef _LaserGunMunition_H__
    30 #define _LaserGunMunition_H__
     29#ifndef _LaserMunition_H__
     30#define _LaserMunition_H__
    3131
    3232#include "OrxonoxPrereqs.h"
     
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport LaserGunMunition : public ReplenishingMunition
     37    class _OrxonoxExport LaserMunition : public ReplenishingMunition
    3838    {
    3939        public:
    40             LaserGunMunition(BaseObject* creator);
    41             virtual ~LaserGunMunition() {}
     40            LaserMunition(BaseObject* creator);
     41            virtual ~LaserMunition() {}
    4242    };
    4343}
    4444
    45 #endif /* _LaserGunMunition_H__ */
     45#endif /* _LaserMunition_H__ */
  • code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc

    r2918 r2920  
    4949        this->speed_ = 1250;
    5050
    51         this->setMunitionName("LaserGunMunition");
     51        this->setMunitionName("LaserMunition");
    5252    }
    5353
Note: See TracChangeset for help on using the changeset viewer.