Changeset 11054 for code/branches/cpp11_v3/src/modules/weapons

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/modules/weapons/IceGunFreezer.cc (modified) (2 diffs)
• src/modules/weapons/IceGunFreezer.h (modified) (1 diff)
• src/modules/weapons/RocketController.cc (modified) (1 diff)
• src/modules/weapons/RocketController.h (modified) (1 diff)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/BillboardProjectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/GravityBomb.h (modified) (1 diff)
• src/modules/weapons/projectiles/GravityBombField.cc (modified) (1 diff)
• src/modules/weapons/projectiles/GravityBombField.h (modified) (1 diff)
• src/modules/weapons/projectiles/IceGunProjectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/LightningGunProjectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/MineProjectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/ParticleProjectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/ParticleProjectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/Projectile.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Projectile.h (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.cc (modified) (1 diff)
• src/modules/weapons/projectiles/Rocket.h (modified) (2 diffs)
• src/modules/weapons/projectiles/RocketOld.cc (modified) (1 diff)
• src/modules/weapons/projectiles/RocketOld.h (modified) (2 diffs)
• src/modules/weapons/projectiles/SimpleRocket.h (modified) (2 diffs)
• src/modules/weapons/weaponmodes/EnergyDrink.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/FusionFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/GravityBombFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/IceGun.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/LaserFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/LightningGun.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFireOld.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/SimpleRocketFire.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/SplitGun.h (modified) (1 diff)

code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.cc

@@ -101 +101 @@
 
         // Check if the freezer is attached to a parent and check if the parent is a SpaceShip
-        if (parent != NULL && parent->isA(Class(SpaceShip)))
+        if (parent != nullptr && parent->isA(Class(SpaceShip)))
         {
             freezedSpaceShip_ = orxonox_cast<SpaceShip*>(parent);
@@ -118 +118 @@
     void IceGunFreezer::stopFreezing()
     {
-        if (freezedSpaceShip_ != NULL && freezeFactor_ != 0.0)
+        if (freezedSpaceShip_ != nullptr && freezeFactor_ != 0.0)
         {
             freezedSpaceShip_->addSpeedFactor(1/freezeFactor_);

code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.h

@@ -55 +55 @@
             IceGunFreezer(Context* context);
             virtual ~IceGunFreezer();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             virtual void startFreezing();
             virtual void stopFreezing();

code/branches/cpp11_v3/src/modules/weapons/RocketController.cc

@@ -38 +38 @@
 #include "projectiles/SimpleRocket.h"
 #include "weaponmodes/SimpleRocketFire.h"
+#include "core/CoreIncludes.h"
 
 namespace orxonox

code/branches/cpp11_v3/src/modules/weapons/RocketController.h

@@ -55 +55 @@
             virtual ~RocketController();
 
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
             /**
             @brief Get the rocket that is controlled by this controller.

code/branches/cpp11_v3/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -88 +88 @@
                                     // The projectile is destroyed by its tick()-function (in the following tick).
 
-            Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is NULL
+            Pawn* victim = orxonox_cast<Pawn*>(otherObject); // If otherObject isn't a Pawn, then victim is nullptr
 
             WorldEntity* entity = orxonox_cast<WorldEntity*>(this);
@@ -146 +146 @@
     bool BasicProjectile::isObjectRelatedToShooter(WorldEntity* otherObject)
     {
-        for (WorldEntity* shooter = this->getShooter(); shooter != NULL; shooter = shooter->getParent())
+        for (WorldEntity* shooter = this->getShooter(); shooter != nullptr; shooter = shooter->getParent())
             if (otherObject == shooter)
                 return true;
-        for (WorldEntity* object = otherObject; object != NULL; object = object->getParent())
+        for (WorldEntity* object = otherObject; object != nullptr; object = object->getParent())
             if (otherObject == this->getShooter())
                 return true;

code/branches/cpp11_v3/src/modules/weapons/projectiles/BillboardProjectile.h

@@ -61 +61 @@
             virtual void setMaterial(const std::string& material);
             virtual const std::string& getMaterial();
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/projectiles/GravityBomb.h

@@ -41 +41 @@
             GravityBomb(Context* context);
             virtual ~GravityBomb();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
             void detonate();
         private:

code/branches/cpp11_v3/src/modules/weapons/projectiles/GravityBombField.cc

@@ -125 +125 @@
 
             //Check if any pawn is inside the shockwave and hit it with dammage proportional to the distance between explosion centre and pawn. Make sure, the same pawn is damaged only once.
-            for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
+            for (Pawn* pawn : ObjectList<Pawn>())
             {
-                Vector3 distanceVector = it->getWorldPosition()-this->getWorldPosition();
+                Vector3 distanceVector = pawn->getWorldPosition()-this->getWorldPosition();
                  //orxout(debug_output) << "Found Pawn:" << it->getWorldPosition() << endl;
                 if(distanceVector.length()< forceSphereRadius_)
                 {
                     //orxout(debug_output) << "Force sphere radius is: " << forceSphereRadius_ << " Distance to Pawn is: " << distanceVector.length();
-                    if (std::find(victimsAlreadyDamaged_.begin(),victimsAlreadyDamaged_.end(),*it) == victimsAlreadyDamaged_.end())
+                    if (std::find(victimsAlreadyDamaged_.begin(),victimsAlreadyDamaged_.end(),pawn) == victimsAlreadyDamaged_.end())
                     {
                         //orxout(debug_output) << "Found Pawn to damage: " << it->getWorldPosition() << endl;
                         float damage = FORCE_FIELD_EXPLOSION_DAMMAGE*(1-distanceVector.length()/EXPLOSION_RADIUS);
                         //orxout(debug_output) << "Damage: " << damage << endl;
-                        it->hit(shooter_, it->getWorldPosition(), NULL, damage, 0,0);
-                        victimsAlreadyDamaged_.push_back(*it);
+                        pawn->hit(shooter_, pawn->getWorldPosition(), nullptr, damage, 0,0);
+                        victimsAlreadyDamaged_.push_back(pawn);
                     }
                 }

code/branches/cpp11_v3/src/modules/weapons/projectiles/GravityBombField.h

@@ -39 +39 @@
     GravityBombField(Context* context);
     virtual ~GravityBombField();
-    virtual void tick(float dt);
+    virtual void tick(float dt) override;
     virtual void destroy();
 

code/branches/cpp11_v3/src/modules/weapons/projectiles/IceGunProjectile.h

@@ -62 +62 @@
 
         protected:
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
             static const float particleDestructionDelay_;
         private:

code/branches/cpp11_v3/src/modules/weapons/projectiles/LightningGunProjectile.h

@@ -58 +58 @@
             virtual ~LightningGunProjectile() {}
 
-            virtual void setMaterial(const std::string& material);
+            virtual void setMaterial(const std::string& material) override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc

@@ -217 +217 @@
             {
                 // Damage all pawns within the damage radius
-                for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
+                for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>().begin(); it; ++it)
                 {
                     Vector3 distanceVector = it->getWorldPosition()-this->getWorldPosition();

code/branches/cpp11_v3/src/modules/weapons/projectiles/ParticleProjectile.cc

@@ -58 +58 @@
         }
         else
-            this->particles_ = 0;
+            this->particles_ = nullptr;
     }
 

code/branches/cpp11_v3/src/modules/weapons/projectiles/ParticleProjectile.h

@@ -53 +53 @@
             ParticleProjectile(Context* context);
             virtual ~ParticleProjectile();
-            virtual void changedVisibility();
+            virtual void changedVisibility() override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/projectiles/Projectile.cc

@@ -94 +94 @@
     void Projectile::setCollisionShapeRadius(float radius)
     {
-        if (collisionShape_ != NULL && radius > 0)
+        if (collisionShape_ != nullptr && radius > 0)
         {
             collisionShape_->setRadius(radius);

code/branches/cpp11_v3/src/modules/weapons/projectiles/Projectile.h

@@ -64 +64 @@
             void setConfigValues();
 
-            virtual void tick(float dt);
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual void tick(float dt) override;
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
         protected:

code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.cc

@@ -117 +117 @@
         else
         {
-            this->defSndWpnEngine_ = 0;
-            this->defSndWpnLaunch_ = 0;
+            this->defSndWpnEngine_ = nullptr;
+            this->defSndWpnLaunch_ = nullptr;
         }
 

code/branches/cpp11_v3/src/modules/weapons/projectiles/Rocket.h

@@ -62 +62 @@
             virtual ~Rocket();
 
-            virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
+            virtual void tick(float dt) override; //!< Defines which actions the Rocket has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-            virtual void destroyObject(void);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+            virtual void destroyObject(void) override;
             void destructionEffect();
 
-            virtual void moveFrontBack(const Vector2& value) {}
-            virtual void moveRightLeft(const Vector2& value) {}
-            virtual void moveUpDown(const Vector2& value) {}
+            virtual void moveFrontBack(const Vector2& value) override {}
+            virtual void moveRightLeft(const Vector2& value) override {}
+            virtual void moveUpDown(const Vector2& value) override {}
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
 
             /**
@@ -114 +114 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
 
             /**

code/branches/cpp11_v3/src/modules/weapons/projectiles/RocketOld.cc

@@ -117 +117 @@
         else
         {
-            this->defSndWpnEngine_ = 0;
-            this->defSndWpnLaunch_ = 0;
+            this->defSndWpnEngine_ = nullptr;
+            this->defSndWpnLaunch_ = nullptr;
         }
 

code/branches/cpp11_v3/src/modules/weapons/projectiles/RocketOld.h

@@ -62 +62 @@
             virtual ~RocketOld();
 
-            virtual void tick(float dt); //!< Defines which actions the RocketOld has to take in each tick.
+            virtual void tick(float dt) override; //!< Defines which actions the RocketOld has to take in each tick.
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
-            virtual void destroyObject(void);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
+            virtual void destroyObject(void) override;
             void destructionEffect();
 
-            virtual void moveFrontBack(const Vector2& value) {}
-            virtual void moveRightLeft(const Vector2& value) {}
-            virtual void moveUpDown(const Vector2& value) {}
+            virtual void moveFrontBack(const Vector2& value) override {}
+            virtual void moveRightLeft(const Vector2& value) override {}
+            virtual void moveUpDown(const Vector2& value) override {}
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
 
             /**
@@ -114 +114 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
-            virtual void fired(unsigned int firemode);
+            virtual void fired(unsigned int firemode) override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/projectiles/SimpleRocket.h

@@ -62 +62 @@
             SimpleRocket(Context* context);
             virtual ~SimpleRocket();
-            virtual void tick(float dt);
+            virtual void tick(float dt) override;
 
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
 
             void disableFire(); //!< Method to disable the fire and stop all acceleration
 
-            virtual void moveFrontBack(const Vector2& value){}
-            virtual void moveRightLeft(const Vector2& value){}
-            virtual void moveUpDown(const Vector2& value){}
+            virtual void moveFrontBack(const Vector2& value) override{}
+            virtual void moveRightLeft(const Vector2& value) override{}
+            virtual void moveUpDown(const Vector2& value) override{}
 
-            virtual void rotateYaw(const Vector2& value);
-            virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);
+            virtual void rotateYaw(const Vector2& value) override;
+            virtual void rotatePitch(const Vector2& value) override;
+            virtual void rotateRoll(const Vector2& value) override;
             void setDestroy();
 
@@ -115 +115 @@
                 { this->rotateRoll(Vector2(value, 0)); }
 
-            virtual void setShooter(Pawn* shooter);
+            virtual void setShooter(Pawn* shooter) override;
 
             inline bool hasFuel() const

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/EnergyDrink.h

@@ -57 +57 @@
             virtual ~EnergyDrink() {}
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/FusionFire.h

@@ -54 +54 @@
             virtual ~FusionFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/GravityBombFire.h

@@ -34 +34 @@
             virtual ~GravityBombFire();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/HsW01.h

@@ -56 +56 @@
             virtual ~HsW01();
 
-            virtual void fire();
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void fire() override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
         protected:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/IceGun.h

@@ -54 +54 @@
             virtual ~IceGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
             
             inline void setFreezeTime(float freezeTime)

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/LaserFire.h

@@ -54 +54 @@
             virtual ~LaserFire() {}
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/LightningGun.h

@@ -54 +54 @@
             virtual ~LightningGun();
 
-            virtual void fire();
+            virtual void fire() override;
 
        private:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/RocketFire.h

@@ -54 +54 @@
             virtual ~RocketFire();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            virtual void fire();
+            virtual void fire() override;
             inline void setFuel(float fuel)
                 { this->fuel_ = fuel; }

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/RocketFireOld.h

@@ -54 +54 @@
             virtual ~RocketFireOld();
 
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/SimpleRocketFire.h

@@ -53 +53 @@
             virtual ~SimpleRocketFire();
             void deactivateFire();
-            virtual void fire();
+            virtual void fire() override;
 
         private:

code/branches/cpp11_v3/src/modules/weapons/weaponmodes/SplitGun.h

@@ -54 +54 @@
             virtual ~SplitGun();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            virtual void fire();
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void fire() override;
 
             inline void setNumberOfSplits(int numberOfSplits)