Changeset 8667 for code/branches/presentation/src/modules/objects

Timestamp:

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

Author:

dafrick

Message:

Possible fix for segfaults due to player being NULL.

Location:

code/branches/presentation/src/modules/objects

Files:

• Script.cc (modified) (2 diffs)
• triggers/DistanceTrigger.cc (modified) (1 diff)
• triggers/MultiTriggerContainer.cc (modified) (1 diff)

code/branches/presentation/src/modules/objects/Script.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)  //TODO: Will this ever happen? If not, change in NotificationDispatcher as well.
+        if(player == NULL)  //TODO: Will this ever happen? If not, change in NotificationDispatcher as well.
         {
             COUT(4) << "The Script was triggered by an entity other than a Pawn. (" << trigger->getIdentifier()->getName() << ")" << std::endl;
-            return false;
-        }
-
-        // Extract the PlayerInfo from the Pawn.
-        PlayerInfo* player = pawn->getPlayer();
-
-        if(player == NULL)
-        {
-            COUT(3) << "The PlayerInfo* is NULL." << std::endl;
             return false;
         }

code/branches/presentation/src/modules/objects/triggers/DistanceTrigger.cc

@@ -205 +205 @@
                         entity = entity->getParent();
 
-                    Pawn* player = orxonox_cast<Pawn*>(entity);
-                    this->setTriggeringPlayer(player);
+                    Pawn* pawn = orxonox_cast<Pawn*>(entity);
+                    if(pawn != NULL)
+                        this->setTriggeringPawn(pawn);
+                    else
+                        CCOUT(2) << "Pawn was NULL." << endl;
                 }
                 

code/branches/presentation/src/modules/objects/triggers/MultiTriggerContainer.cc

@@ -73 +73 @@
         {
             this->setForPlayer(true);
-            this->setTriggeringPlayer(pawn);
+            this->setTriggeringPawn(pawn);
         }
     }