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

Timestamp:

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

Author:

dafrick

Message:

Possible fix for segfaults due to player being NULL.

Location:

code/branches/presentation/src/modules/objects/triggers

Files:

• DistanceTrigger.cc (modified) (1 diff)
• MultiTriggerContainer.cc (modified) (1 diff)

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);
         }
     }