Changeset 2195 for code/branches/questsystem2/src

Timestamp:

Nov 12, 2008, 2:28:46 PM (16 years ago)

Author:

dafrick

Message:

Some more stuff on Triggers…

Location:

code/branches/questsystem2/src/orxonox/objects/quest

Files:

• QuestEffectBeacon.cc (modified) (3 diffs)
• QuestEffectBeacon.h (modified) (2 diffs)

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

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
+#include "core/Event.h"
 #include "core/EventIncludes.h"
 
@@ -49 +50 @@
         this->times_ = -1;
         this->trigger_ = NULL;
+        this->player_ = NULL;
     }
 
@@ -67 +69 @@
     {
         SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
+        
+        this->player_ = dynamic_cast<ControllableEntity*>(event.originator_);
     }
     
-    bool QuestEffectBeacon::execute(ControllableEntity* player)
+    bool QuestEffectBeacon::execute(void)
     {
+        
         if(!(this->isActive()))
         {
             return false;
         }
-        if(player == NULL)
+        if(this->player_ == NULL)
         {
             return false;
         }
         
-        bool check = QuestEffect::invokeEffects(player, this->effects_);
+        bool check = QuestEffect::invokeEffects(this->player_, this->effects_);
         if(check)
         {

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

@@ -63 +63 @@
             virtual void processEvent(Event& event);
             
-            bool execute(ControllableEntity* player);
+            bool execute(void);
             
             bool isActive(void);
@@ -78 +78 @@
             QuestEffectBeaconStatus::Enum status_;
             PlayerTrigger* trigger_;
+            ControllableEntity* player_;
             
             bool setTimes(const int & n);