[Orxonox-commit 4594] r9265 - code/trunk/src/orxonox/controllers

landauf at orxonox.net landauf at orxonox.net
Sun Jun 3 10:14:19 CEST 2012


Author: landauf
Date: 2012-06-03 10:14:18 +0200 (Sun, 03 Jun 2012)
New Revision: 9265

Modified:
   code/trunk/src/orxonox/controllers/FormationController.cc
Log:
fixed indentation

Modified: code/trunk/src/orxonox/controllers/FormationController.cc
===================================================================
--- code/trunk/src/orxonox/controllers/FormationController.cc	2012-06-02 22:12:32 UTC (rev 9264)
+++ code/trunk/src/orxonox/controllers/FormationController.cc	2012-06-03 08:14:18 UTC (rev 9265)
@@ -254,8 +254,9 @@
     //used, when slaves are in DEFEND mode.
     void FormationController::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
     {
-        if (!this->formationFlight_ || this->state_!=MASTER || this->formationMode_!=DEFEND) return;
-            this->masterAttacked(originator);
+        if (!this->formationFlight_ || this->state_ != MASTER || this->formationMode_ != DEFEND)
+            return;
+        this->masterAttacked(originator);
     }
 
     void FormationController::removeFromFormation()




More information about the Orxonox-commit mailing list