Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (deleted)
• src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (deleted)
• src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) (1 diff)

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

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

code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc

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