Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 18, 2009, 6:14:52 PM (16 years ago)
Author:
landauf
Message:

Added many new features in the Munition class:

  • there are now 3 modes: a) every weapon has it's own magazine b) all weapons use the same magazin c) no magazines, just a big munition pool
  • the Munition class handles the reloading of the magazine

Split the Weapon class into Weapon and WeaponMode. WeaponMode creates the fire of the Weapon. A weapon can own several WeaponModes (for example primary and secondary fire). But it's also possible to have a weapon with several muzzles which all fire at the same time (there's a WeaponMode for each muzzle).

Renamed LaserGun to LaserFire and Fusion to FusionFire. They inherit now from WeaponMode.

Changed the code in the Weapon class to use the new Munition functionality.

Added ReplenishingMunition, a subclass of Munition that replenishes itself (used for LaserGunMunition).

Added a reload command to reload magazines.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weapons/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.h

    r2912 r2918  
    3131
    3232#include "OrxonoxPrereqs.h"
    33 #include "objects/weaponSystem/Munition.h"
     33#include "ReplenishingMunition.h"
    3434
    3535namespace orxonox
    3636{
    37     class _OrxonoxExport LaserGunMunition : public Munition
     37    class _OrxonoxExport LaserGunMunition : public ReplenishingMunition
    3838    {
    3939        public:
    4040            LaserGunMunition(BaseObject* creator);
    41             virtual ~LaserGunMunition();
    42 
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    44 
    45 
    46         private:
    47 
    48 
     41            virtual ~LaserGunMunition() {}
    4942    };
    5043}
Note: See TracChangeset for help on using the changeset viewer.