Changeset 11065 for code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc

Timestamp:

Jan 17, 2016, 1:59:00 PM (8 years ago)

Author:

landauf

Message:

added c++11 features to code that was added in presentationHS15

File:

• code/branches/cpp11_v3/src/modules/weapons/projectiles/MineProjectile.cc (modified) (2 diffs)

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

@@ -112 +112 @@
         modelRing4_->yaw(Degree(270));
 
-        emitter_ = NULL;
+        emitter_ = nullptr;
 
         if (GameMode::isMaster())
@@ -217 +217 @@
             {
                 // Damage all pawns within the damage radius
-                for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>().begin(); it; ++it)
+                for (Pawn* pawn : ObjectList<Pawn>())
                 {
-                    Vector3 distanceVector = it->getWorldPosition()-this->getWorldPosition();
+                    Vector3 distanceVector = pawn->getWorldPosition()-this->getWorldPosition();
                     if(distanceVector.length()< damageRadius_)
                     {
-                        it->hit(this->getShooter(), it->getWorldPosition(), NULL, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
+                        pawn->hit(this->getShooter(), pawn->getWorldPosition(), nullptr, this->getDamage(), this->getHealthDamage(), this->getShieldDamage());
                     }
                 }