Changeset 2193 for code/branches/questsystem2/src/orxonox/objects/quest

Timestamp:

Nov 12, 2008, 2:20:51 PM (16 years ago)

Author:

dafrick

Message:

Playing with Triggers.

Location:

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

Files:

• QuestEffectBeacon.cc (modified) (3 diffs)
• QuestEffectBeacon.h (modified) (1 diff)

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"
 
 #include "orxonox/objects/worldentities/ControllableEntity.h"
-#include "orxonox/objects/worldentities/triggers/Trigger.h"
+#include "orxonox/objects/worldentities/triggers/PlayerTrigger.h"
 #include "QuestEffect.h"
 
@@ -64 +64 @@
     }
     
-    void processEvent(Event& event)
+    void QuestEffectBeacon::processEvent(Event& event)
     {
-        //TDO. Resolve pseudo code.
-        //if(isControllableEntity(event.originator_))
-        //{
-        //    SetEvent(BaseObject, "activity", execute, event);
-        //}
+        SetSubclassEvent(QuestEffectBeacon, "execute", execute, event, PlayerTrigger);
     }
     
@@ -150 +146 @@
     }
     
-    bool QuestEffectBeacon::addTrigger(Trigger* trigger)
+    bool QuestEffectBeacon::addTrigger(PlayerTrigger* trigger)
     {
         if(this->trigger_ != NULL)

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

@@ -77 +77 @@
             int times_; //!< Number of times the beacon can be exectued.
             QuestEffectBeaconStatus::Enum status_;
-            Trigger* trigger_;
+            PlayerTrigger* trigger_;
             
             bool setTimes(const int & n);
             bool addEffect(QuestEffect* effect);
-            bool addTrigger(Trigger* trigger);
+            bool addTrigger(PlayerTrigger* trigger);
             
             const QuestEffect* getEffect(unsigned int index) const;