Changeset 11083 for code/trunk/src/orxonox/controllers/WingmanController.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/WingmanController.cc (modified) (3 diffs)

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

@@ -58 +58 @@
     void WingmanController::action()
     {
-        if (!this || !this->getControllableEntity() || !this->isActive())
+        if (!this->getControllableEntity() || !this->isActive())
             return;
         //----If no leader, find one----
@@ -64 +64 @@
         {
             ActionpointController* newLeader = (findNewLeader());
-            if (!this || !this->getControllableEntity())
-                return;
 
             this->myLeader_ = newLeader;
@@ -92 +90 @@
             else if (!this->myLeader_->bKeepFormation_)
             {
-                if (!this || !this->getControllableEntity())
-                    return;
 
                 if (!this->hasTarget())