Changeset 7846 for code/trunk/src/modules

Timestamp:

Feb 10, 2011, 4:59:00 PM (14 years ago)

Author:

landauf

Message:

fixed "No munition class defined in WeaponMode" warning:
you have to actually create the munition class, it's not just a string
→ added RocketMunition

Location:

code/trunk/src/modules/weapons

Files:

• WeaponsPrereqs.h (modified) (1 diff)
• munitions/CMakeLists.txt (modified) (1 diff)
• munitions/RocketMunition.cc (added)
• munitions/RocketMunition.h (added)
• weaponmodes/RocketFire.cc (modified) (1 diff)
• weaponmodes/SimpleRocketFire.cc (modified) (1 diff)

code/trunk/src/modules/weapons/WeaponsPrereqs.h

@@ -71 +71 @@
     class LaserMunition;
     class ReplenishingMunition;
+    class RocketMunition;
 
     // projectiles

code/trunk/src/modules/weapons/munitions/CMakeLists.txt

@@ -3 +3 @@
   LaserMunition.cc
   FusionMunition.cc
+  RocketMunition.cc
 )

code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -51 +51 @@
         this->speed_ = 500;
 
-        this->setMunitionName("LaserMunition");
+        this->setMunitionName("RocketMunition");
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }

code/trunk/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

@@ -53 +53 @@
         this->speed_ = 500;
 
-            this->setMunitionName("TargetSeeking Rockets");
-            this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
+        this->setMunitionName("RocketMunition");
+        this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4f);
         // The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
     }