Changeset 10946 for code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc

Timestamp:

Dec 7, 2015, 4:06:37 PM (8 years ago)

Author:

gania

Message:

fix for sigsegv?

File:

• code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc (modified) (21 diffs)

code/branches/campaignHS15/src/orxonox/controllers/ActionpointController.cc

@@ -113 +113 @@
             this->moveToTargetPosition(dt);
         }
+        if (!this || !this->getControllableEntity())
+            return;
         else if (this->bLookAtTarget_)
         {
@@ -146 +148 @@
             this->bDodge_ = true;
         }
+        if (!this || !this->getControllableEntity())
+            return;
         if (ActionpointController::sTicks_ % 100 == step * this->actionpointControllerId_ + 1)
         {
@@ -175 +179 @@
                 this->doFire();
             }
+            if (!this || !this->getControllableEntity())
+                return;
             this->deltaHp = orxonox_cast<Pawn*> (this->getControllableEntity())->getHealth() - this->previousHp;
             this->previousHp = orxonox_cast<Pawn*> (this->getControllableEntity())->getHealth();
@@ -202 +208 @@
             if (this->parsedActionpoints_.empty() && this->loopActionpoints_.empty() && this->bDefaultFightAll_)
             {
+                if (!this || !this->getControllableEntity())
+                    return;
                 Point p = { Action::FIGHTALL, "", Vector3::ZERO, false };
                 this->parsedActionpoints_.push_back (p);
             }
+            if (!this || !this->getControllableEntity())
+                return;
             this->executeActionpoint();
+            if (!this || !this->getControllableEntity())
+                return;
             this->bTakenOver_ = false;
         }
@@ -220 +232 @@
                 if (newTarget)
                 {
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->setAction (Action::FIGHTALL, newTarget);
                 }
                 else
                 {
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->nextActionpoint();
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->executeActionpoint();
     
@@ -233 +251 @@
         else if (this->action_ == Action::FIGHT)
         {
-
             if (!this->hasTarget() )
             {
                 //----find a target----
-                ControllableEntity* newTarget = this->closestTarget();    
+                ControllableEntity* newTarget = this->closestTarget();  
+                if (!this || !this->getControllableEntity())
+                    return;  
                 if (newTarget && 
                         CommonController::distance (this->getControllableEntity(), newTarget) < this->attackRange_)
                 {
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->setAction (Action::FIGHT, newTarget);
                 }
                 else
                 {
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->nextActionpoint();
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->executeActionpoint();
                 }
@@ -257 +282 @@
                 {
                     ControllableEntity* newTarget = this->closestTarget();
-                    
+                    if (!this || !this->getControllableEntity())
+                        return;
                     if (newTarget && 
                         CommonController::distance (this->getControllableEntity(), newTarget) < this->attackRange_)
                     {
+                        if (!this || !this->getControllableEntity())
+                            return;
                         this->setAction (Action::FIGHT, newTarget);
                     }
                     else
                     {
+                        if (!this || !this->getControllableEntity())
+                            return;
                         this->nextActionpoint();
+                        if (!this || !this->getControllableEntity())
+                            return;
                         this->executeActionpoint();
                     }
@@ -275 +307 @@
             if (this->squaredDistanceToTarget() <= this->squaredaccuracy_)
             {
+                if (!this || !this->getControllableEntity())
+                    return;
                 this->nextActionpoint();   
+                if (!this || !this->getControllableEntity())
+                    return;
                 this->executeActionpoint();
             }
@@ -283 +319 @@
             if (!this->getProtect())
             {
+                if (!this || !this->getControllableEntity())
+                    return;
                 this->nextActionpoint();
+                if (!this || !this->getControllableEntity())
+                    return;
                 this->executeActionpoint(); 
             }
+            if (!this || !this->getControllableEntity())
+                return;
             this->stayNearProtect();
         }
         else if (this->action_ == Action::ATTACK)
         {   
-
+            if (!this || !this->getControllableEntity())
+                return;
             if (!this->hasTarget())
             {
+                if (!this || !this->getControllableEntity())
+                    return;
                 this->nextActionpoint();
+                if (!this || !this->getControllableEntity())
+                    return;
                 this->executeActionpoint();
             }
@@ -302 +349 @@
     void ActionpointController::setProtect (ControllableEntity* protect)
     {
+
         this->protect_ = protect;
     }
     ControllableEntity* ActionpointController::getProtect ()
     {
+
         return this->protect_;
     }
@@ -401 +450 @@
     void ActionpointController::setAction (Action::Value action, ControllableEntity* target)
     {
+        if (!this || !this->getControllableEntity())
+            return;
         this->action_ = action;
         if (action == Action::FIGHT || action == Action::FIGHTALL || action == Action::ATTACK)
@@ -415 +466 @@
     void ActionpointController::setAction (Action::Value action, const Vector3& target)
     {
+        if (!this || !this->getControllableEntity())
+            return;
         this->action_ = action;
         if (action == Action::FLY)
@@ -423 +476 @@
     void ActionpointController::setAction (Action::Value action, const Vector3& target,  const Quaternion& orient )
     {
+        if (!this || !this->getControllableEntity())
+            return;
         this->action_ = action;
         if (action == Action::FLY)
@@ -466 +521 @@
             return;
         }
+        if (!this || !this->getControllableEntity())
+            return;
         if (!this->bLoop_ && this->parsedActionpoints_.back().inLoop)
         {
             //MOVES all points that are in loop to a loop vector
             this->fillLoop();
+            if (!this || !this->getControllableEntity())
+                return;
             this->bLoop_ = true;
             executeActionpoint();
             return;
         }
+        if (!this || !this->getControllableEntity())
+            return;
         this->setAction (p.action);
         if (!this || !this->getControllableEntity())
@@ -487 +548 @@
                 for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
                 {
+                    if (!this || !this->getControllableEntity())
+                        return;
                     if (CommonController::getName(*itP) == targetName)
                     {
@@ -497 +560 @@
             {
                 this->setTargetPosition( p.position );
+                if (!this || !this->getControllableEntity())
+                    return;
                 if (this->squaredDistanceToTarget() <= this->squaredaccuracy_)
                 {
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->nextActionpoint();
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->executeActionpoint();
                 }
@@ -553 +622 @@
                     if (CommonController::getName(*itP) == targetName)
                     {
+                        if (!this || !this->getControllableEntity())
+                            return;
                         this->setTarget (static_cast<ControllableEntity*>(*itP));
                     }
@@ -559 +630 @@
                 {
                     this->nextActionpoint();
+                    if (!this || !this->getControllableEntity())
+                        return;
                     this->executeActionpoint();
                 }
@@ -648 +721 @@
     void ActionpointController::takeActionpoints (const std::vector<Point>& vector, const std::vector<Point>& loop, bool b)
     {
-      this->parsedActionpoints_ = vector;
-      this->loopActionpoints_ = loop;
-      this->bLoop_ = b;
-      this->bTakenOver_ = true;
+        if (!this || !this->getControllableEntity())
+            return;
+        this->parsedActionpoints_ = vector;
+        if (!this || !this->getControllableEntity())
+            return;
+        this->loopActionpoints_ = loop;
+        this->bLoop_ = b;
+        this->bTakenOver_ = true;
     }
     void ActionpointController::setClosestTarget()
@@ -667 +744 @@
         for (ObjectList<Pawn>::iterator itP = ObjectList<Pawn>::begin(); itP; ++itP)
         {
+            if (!this || !this->getControllableEntity())
+                return 0;
             if ( CommonController::sameTeam (this->getControllableEntity(), static_cast<ControllableEntity*>(*itP), gt) )
                 continue;
@@ -692 +771 @@
             if (!this->target_ || (this->target_ && CommonController::distance (this->getControllableEntity(), this->target_) > this->attackRange_))
             {
+                if (!this || !this->getControllableEntity())
+                    return;
                 Pawn* newTarget = this->closestTarget();
                 if ( newTarget &&