Changeset 2893 for code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc

Timestamp:

Apr 5, 2009, 11:27:54 PM (16 years ago)

Author:

landauf

Message:

merged weaponsystem branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc

@@ -43 +43 @@
         RegisterObject(LaserGunMunition);
 
+        //default if not defined in XML
         this->maxBullets_ = 40;
         this->maxMagazines_ = 100;