Changeset 2918 for code/branches/weapons/src/orxonox/objects/worldentities

Timestamp:

Apr 18, 2009, 6:14:52 PM (17 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.

Location:

code/branches/weapons/src/orxonox/objects/worldentities

Files:

• ControllableEntity.h (modified) (1 diff)
• pawns/Pawn.cc (modified) (4 diffs)
• pawns/Pawn.h (modified) (2 diffs)

code/branches/weapons/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -82 +82 @@
 
             virtual void fire(unsigned int firemode) {}
+            virtual void reload() {}
 
             virtual void boost() {}

code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -56 +56 @@
         this->fire_ = 0x0;
         this->firehack_ = 0x0;
+        this->bReload_ = false;
 
         this->health_ = 0;
@@ -115 +116 @@
         registerVariable(this->initialHealth_, variableDirection::toclient);
         registerVariable(this->fire_,          variableDirection::toserver);
+        registerVariable(this->bReload_,       variableDirection::toserver);
     }
 
@@ -121 +123 @@
         SUPER(Pawn, tick, dt);
 
-        if (this->weaponSystem_)
+        if (this->weaponSystem_ && GameMode::isMaster())
         {
             for (unsigned int firemode = 0; firemode < WeaponSystem::MAX_FIRE_MODES; firemode++)
                 if (this->fire_ & WeaponSystem::getFiremodeMask(firemode))
                     this->weaponSystem_->fire(firemode);
-        }
+
+            if (this->bReload_)
+                this->weaponSystem_->reload();
+        }
+
         this->fire_ = this->firehack_;
         this->firehack_ = 0x0;
+        this->bReload_ = false;
 
         if (this->health_ <= 0)
@@ -258 +265 @@
     }
 
+    void Pawn::reload()
+    {
+        this->bReload_ = true;
+    }
+
     void Pawn::postSpawn()
     {

code/branches/weapons/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -81 +81 @@
 
             virtual void fire(unsigned int firemode);
+            virtual void reload();
             virtual void postSpawn();
 
@@ -131 +132 @@
             unsigned int fire_;
             unsigned int firehack_;
+            bool bReload_;
 
             std::string spawnparticlesource_;