Changeset 9272 for code/branches/presentation2012merge/src/orxonox/worldentities/pawns

Timestamp:

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

Author:

landauf

Message:

replaced tabs with spaces (no code changed)

Location:

code/branches/presentation2012merge/src/orxonox/worldentities/pawns

Files:

• Pawn.cc (modified) (1 diff)
• SpaceShip.cc (modified) (3 diffs)

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())

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

@@ -133 +133 @@
     {
         SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
-        
+
         SetConfigValueExternal(bEnableMotionBlur_, "GraphicsSettings", "enableMotionBlur", true)
             .description("Enable or disable the motion blur effect when moving very fast")
@@ -503 +503 @@
     void SpaceShip::resetCamera()
     {
-        if(this->hasLocalController() && this->hasHumanController())
-        {
+        if(this->hasLocalController() && this->hasHumanController())
+        {
             Camera *camera = this->getCamera();
             if (camera == 0)
@@ -514 +514 @@
             camera->setPosition(this->cameraOriginalPosition_);
             camera->setOrientation(this->cameraOriginalOrientation_);
-        }
+        }
     }