Changeset 11142 for code/branches/sagerjFS16

Timestamp:

Mar 17, 2016, 3:53:19 PM (8 years ago)

Author:

sagerj

Message:

first commit, added discharger weaponclass

Location:

code/branches/sagerjFS16/src

Files:

• modules/weapons/weaponmodes/Discharger.cc (added)
• modules/weapons/weaponmodes/Discharger.h (added)
• orxonox/controllers/NewHumanController.cc (modified) (1 diff)
• orxonox/weaponsystem/WeaponMode.h (modified) (1 diff)

code/branches/sagerjFS16/src/orxonox/controllers/NewHumanController.cc

@@ -348 +348 @@
         if (NewHumanController::localController_s)
             NewHumanController::localController_s->doUnfire();
+        orxout() << "unfire" << endl;
     }
 

code/branches/sagerjFS16/src/orxonox/weaponsystem/WeaponMode.h

@@ -45 +45 @@
     /**
     @brief
-        A WeaponMode defines how a Weapon is used. It specifies what kind of @ref orxonox::Projectile is created when you fire it, how much time it takes to reload, what sound you hear while shooting, how much damage the projectile deals to a target, ...
+        A WeaponMode defines how a Weapon is used. It specifies what kind of
+        @ref orxonox::Projectile is created when you fire it, how much time it takes to reload,
+        what sound you hear while shooting, how much damage the projectile deals to a target, ...
     */
     class _OrxonoxExport WeaponMode : public BaseObject