Changeset 9272 for code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc

Timestamp:

Jun 3, 2012, 6:05:24 PM (12 years ago)

Author:

landauf

Message:

replaced tabs with spaces (no code changed)

File:

• code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/presentation2012merge/src/orxonox/worldentities/pawns/Pawn.cc

@@ -232 +232 @@
     {
         //Applies multiplier given by the DamageBoost Pickup.
-        Pawn *test = dynamic_cast<Pawn *>(originator);
-        if( test != NULL )
-        {
-          damage *= originator->getDamageMultiplier();
-        }
-
-        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
+        Pawn *test = dynamic_cast<Pawn *>(originator);
+        if( test != NULL )
+        {
+            damage *= originator->getDamageMultiplier();
+        }
+
+        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
         {
             if (shielddamage >= this->getShieldHealth())