Changeset 11083 for code/trunk/src/orxonox/controllers/FightingController.cc

Timestamp:

Jan 21, 2016, 1:59:04 PM (8 years ago)

Author:

muemart

Message:

Fix some clang-tidy warnings.
Also, Serialise.h was doing some C-style casts that ended up being const casts. I moved those const casts as close to the source as possible and changed the loadAndIncrease functions to not do that.

File:

• code/trunk/src/orxonox/controllers/FightingController.cc (modified) (5 diffs)

code/trunk/src/orxonox/controllers/FightingController.cc

@@ -58 +58 @@
     void FightingController::lookAtTarget(float dt)
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return;
         ControllableEntity* entity = this->getControllableEntity();
@@ -124 +124 @@
         Vector3 diffUnit = diffVector/diffLength;
 
-        if (!this || !this->getControllableEntity())
-            return;
-
         //too far? well, come closer then
         if (diffLength > this->attackRange_)
@@ -142 +139 @@
             this->bKeepFormation_ = false;
 
-            if (!this || !this->getControllableEntity())
-                return;
             if (!this->bDodge_)
             {
@@ -217 +212 @@
     float FightingController::squaredDistanceToTarget()  const
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return 0;
         if (!this->target_ || !this->getControllableEntity())
@@ -237 +232 @@
     Pawn* FightingController::closestTarget() const
     {
-        if (!this || !this->getControllableEntity())
+        if (!this->getControllableEntity())
             return nullptr;