Changeset 2920

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:

• OrxonoxPrereqs.h (modified) (1 diff)
• objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• objects/weaponSystem/munitions/LaserMunition.cc (moved) (moved from code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc) (2 diffs)
• objects/weaponSystem/munitions/LaserMunition.h (moved) (moved from code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h) (2 diffs)
• objects/weaponSystem/weapons/LaserFire.cc (modified) (1 diff)

code/branches/weapons/src/orxonox/OrxonoxPrereqs.h

@@ -165 +165 @@
     class ReplenishingMunition;
     class Munition;
-    class LaserGunMunition;
+    class LaserMunition;
     class FusionMunition;
 

code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   ReplenishingMunition.cc
-  LaserGunMunition.cc
+  LaserMunition.cc
   FusionMunition.cc
 )

code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.cc

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
-#include "LaserGunMunition.h"
+#include "LaserMunition.h"
 
 #include "core/CoreIncludes.h"
@@ -34 +34 @@
 namespace orxonox
 {
-    CreateFactory(LaserGunMunition);
+    CreateFactory(LaserMunition);
 
-    LaserGunMunition::LaserGunMunition(BaseObject* creator) : ReplenishingMunition(creator)
+    LaserMunition::LaserMunition(BaseObject* creator) : ReplenishingMunition(creator)
     {
-        RegisterObject(LaserGunMunition);
+        RegisterObject(LaserMunition);
 
         this->maxMunitionPerMagazine_ = 20;

code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserMunition.h

@@ -27 +27 @@
  */
 
-#ifndef _LaserGunMunition_H__
-#define _LaserGunMunition_H__
+#ifndef _LaserMunition_H__
+#define _LaserMunition_H__
 
 #include "OrxonoxPrereqs.h"
@@ -35 +35 @@
 namespace orxonox
 {
-    class _OrxonoxExport LaserGunMunition : public ReplenishingMunition
+    class _OrxonoxExport LaserMunition : public ReplenishingMunition
     {
         public:
-            LaserGunMunition(BaseObject* creator);
-            virtual ~LaserGunMunition() {}
+            LaserMunition(BaseObject* creator);
+            virtual ~LaserMunition() {}
     };
 }
 
-#endif /* _LaserGunMunition_H__ */
+#endif /* _LaserMunition_H__ */

code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc

@@ -49 +49 @@
         this->speed_ = 1250;
 
-        this->setMunitionName("LaserGunMunition");
+        this->setMunitionName("LaserMunition");
     }