Changeset 6752

Timestamp:

Apr 19, 2010, 9:37:18 AM (14 years ago)

Author:

rgrieder

Message:

Fixed PickupManager::getPawn() method against NULL pointers.
(Doesn't fix the issue I currently have though!)

File:

• code/trunk/src/modules/pickup/PickupManager.cc (modified) (1 diff)

code/trunk/src/modules/pickup/PickupManager.cc

@@ -152 +152 @@
     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);
     }