Changeset 8667 for code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc

Timestamp:

May 29, 2011, 6:44:45 PM (13 years ago)

Author:

dafrick

Message:

Possible fix for segfaults due to player being NULL.

File:

• code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc (modified) (3 diffs)

code/branches/presentation/src/modules/notifications/NotificationDispatcher.cc

@@ -140 +140 @@
 
         PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
-        Pawn* pawn = NULL;
+        PlayerInfo* player = NULL;
 
         // If the trigger is a PlayerTrigger.
@@ -148 +148 @@
                 return false;
             else
-                pawn = pTrigger->getTriggeringPlayer();
+                player = pTrigger->getTriggeringPlayer();
         }
         else
             return false;
 
-        if(pawn == NULL)
+        if(player == NULL)
         {
             COUT(4) << "The NotificationDispatcher was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
@@ -159 +159 @@
         }
 
-        // Extract the PlayerInfo from the Pawn.
-        PlayerInfo* player = pawn->getPlayer();
-
-        if(player == NULL)
-        {
-            CCOUT(3) << "The PlayerInfo* is NULL." << std::endl;
-            return false;
-        }
-
-        // HACK fix. Resolve this issue another way...
-        if(GameMode::isStandalone())
-            this->dispatch(0);
-        else
-            this->dispatch(player->getClientID());
+        this->dispatch(player->getClientID());
 
         return true;