Changeset 6540 for code/trunk/src/modules/weapons

Timestamp:

Mar 16, 2010, 9:35:11 PM (15 years ago)

Author:

dafrick

Message:

Removed some TODO's. Finished up documenting pickup module.

Location:

code/trunk/src/modules/weapons/projectiles

Files:

• Projectile.cc (modified) (1 diff)
• Rocket.cc (modified) (1 diff)

code/trunk/src/modules/weapons/projectiles/Projectile.cc

@@ -123 +123 @@
             }
 
-            float dmg = this->damage_;
-            //TODO: Remove.
-//             if (this->owner_)
-//                 dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
-
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
-                victim->hit(this->owner_, contactPoint, dmg);
+                victim->hit(this->owner_, contactPoint, this->damage_);
         }
         return false;

code/trunk/src/modules/weapons/projectiles/Rocket.cc

@@ -200 +200 @@
             }
 
-            float dmg = this->damage_;
-            //TODO: This souldn't be necessary here.
-            //if (this->owner_)
-            //    dmg = this->owner_->getPickups().processModifiers(ModifierType::Damage, dmg, false);
-
             Pawn* victim = orxonox_cast<Pawn*>(otherObject);
             if (victim)
-                victim->hit(this->owner_, contactPoint, dmg);
+                victim->hit(this->owner_, contactPoint, this->damage_);
 //             this->destroy();
         }