Changeset 2205 for code/branches/questsystem2/src/orxonox/objects/quest/QuestEffectBeacon.cc

Timestamp:

Nov 13, 2008, 9:55:01 PM (17 years ago)

Author:

dafrick

Message:

Changed from ControllableEntity to PlayerInfo…

File:

• code/branches/questsystem2/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) (3 diffs)

code/branches/questsystem2/src/orxonox/objects/quest/QuestEffectBeacon.cc

@@ -35 +35 @@
 #include "core/EventIncludes.h"
 
+#include "orxonox/objects/infos/PlayerInfo.h"
 #include "orxonox/objects/worldentities/ControllableEntity.h"
 #include "orxonox/objects/worldentities/triggers/PlayerTrigger.h"
@@ -50 +51 @@
         this->times_ = -1;
         this->trigger_ = NULL;
-        this->player_ = NULL;
     }
 
@@ -69 +69 @@
     {
         SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
-        
-        this->player_ = dynamic_cast<ControllableEntity*>(event.originator_);
     }
     
-    bool QuestEffectBeacon::execute(void)
+    bool QuestEffectBeacon::execute(bool b, ControllableEntity* entity)
     {
-        
-        if(!(this->isActive()))
+        if(!b || !(this->isActive()))
         {
             return false;
         }
-        if(this->player_ == NULL)
+        if(entity == NULL)
         {
             return false;
         }
         
-        bool check = QuestEffect::invokeEffects(this->player_, this->effects_);
+        PlayerInfo* player = entity->getPlayer();
+        
+        bool check = QuestEffect::invokeEffects(player, this->effects_);
         if(check)
         {