[Orxonox-commit 2035] r6752 - code/trunk/src/modules/pickup

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-04-19 09:37:18 +0200 (Mon, 19 Apr 2010)
New Revision: 6752

Modified:
   code/trunk/src/modules/pickup/PickupManager.cc
Log:
Fixed PickupManager::getPawn() method against NULL pointers.
(Doesn't fix the issue I currently have though!)

Modified: code/trunk/src/modules/pickup/PickupManager.cc
===================================================================
--- code/trunk/src/modules/pickup/PickupManager.cc	2010-04-17 20:04:43 UTC (rev 6751)
+++ code/trunk/src/modules/pickup/PickupManager.cc	2010-04-19 07:37:18 UTC (rev 6752)
@@ -151,10 +151,11 @@
     
     PickupCarrier* PickupManager::getPawn(void)
     {
-        Pawn* pawn = dynamic_cast<Pawn*>(GUIManager::getInstance().getPlayer(PickupManager::guiName_s)->getControllableEntity());
-        if(pawn == NULL)
+        PlayerInfo* player = GUIManager::getInstance().getPlayer(PickupManager::guiName_s);
+        if (player != NULL)
+            return dynamic_cast<PickupCarrier*>(player->getControllableEntity());
+        else
             return NULL;
-        return dynamic_cast<PickupCarrier*>(pawn);
     }
     
     int PickupManager::getNumCarrierChildren(PickupCarrier* carrier)