Changeset 8995 for code/branches/presentation2011

Timestamp:

Dec 17, 2011, 11:49:36 PM (13 years ago)

Author:

jo

Message:

check to prevent crashes.

Location:

code/branches/presentation2011/src

Files:

• modules/overlays/hud/HUDEnemyHealthBar.cc (modified) (1 diff)
• orxonox/controllers/FormationController.cc (modified) (2 diffs)
• orxonox/gametypes/TeamGametype.cc (modified) (1 diff)

code/branches/presentation2011/src/modules/overlays/hud/HUDEnemyHealthBar.cc

@@ -119 +119 @@
 
                 // get mouse position
-                currentYaw = dynamic_cast<NewHumanController*>(dynamic_cast<ControllableEntity*>(this->getOwner())->getController())->getCurrentYaw();
-                currentPitch = dynamic_cast<NewHumanController*>(dynamic_cast<ControllableEntity*>(this->getOwner())->getController())->getCurrentPitch();
-
+                if(this->getOwner() && dynamic_cast<ControllableEntity*>(this->getOwner())->getController() && dynamic_cast<NewHumanController*>(dynamic_cast<ControllableEntity*>(this->getOwner())->getController()))
+                {
+                    currentYaw = dynamic_cast<NewHumanController*>(dynamic_cast<ControllableEntity*>(this->getOwner())->getController())->getCurrentYaw();
+                    currentPitch = dynamic_cast<NewHumanController*>(dynamic_cast<ControllableEntity*>(this->getOwner())->getController())->getCurrentPitch();
+                }
                 // Compare cursor position to object position
                 if ( fabs(pos.x - currentYaw) < sens_ && fabs(pos.y - currentPitch) < sens_ )

code/branches/presentation2011/src/orxonox/controllers/FormationController.cc

@@ -40 +40 @@
 #include "gametypes/TeamDeathmatch.h"
 #include "gametypes/Dynamicmatch.h"
-#include "gametypes/Mission.h" TODO: include mission after merging
+#include "gametypes/Mission.h"
 #include "gametypes/Gametype.h"
 #include "controllers/WaypointPatrolController.h"
@@ -89 +89 @@
         this->speedCounter_ = 0.2f;
         this->targetPosition_ = Vector3::ZERO;
-        //this->team_=-1;
+        this->team_=-1;
         this->target_.setCallback(createFunctor(&FormationController::targetDied, this));
   }

code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc

@@ -311 +311 @@
     void TeamGametype::colourPawn(Pawn* pawn, int teamNr)
     {// catch no-colouring-case and wrong input
-        if(teamNr < 0 || pawn == NULL) return;
+        if(teamNr < 0 || teamNr+1 > this->teamcolours_.size() ||pawn == NULL) return;
         pawn->setRadarObjectColour(this->teamcolours_[teamNr]);