Changeset 6800 for code/trunk/src/modules/questsystem

Timestamp:

Apr 29, 2010, 1:16:16 PM (14 years ago)

Author:

dafrick

Message:

Created a new class of triggers called Multitriggers.
MultiTriggers are triggers which (as opposed to normal triggers) have a state for each object triggering the MultiTrigger, that means, that a MultiTrigger can be triggered for two different Players, while not being triggered for a third.
To go with this MultiTrigger I created a data structure (MultitriggerContainer), which helps relaying important information to the objects, that receive the Events of the trigger.
Also there is a MultiDistanceTrigger, which is just the DistanceTrigger as a MultiTrigger.

To make this work I had to make some adjustements to the eventsystem, namely an EventState can now be either an EventState (as it was before) or an EventSink, which means that every efent arriving at the EventState is processed as opposed to just the ones which change the state.
There is a new makro (XMLPortEventSink) to create an EventState with sink behaviour. It can be used exacly as the XMLPortEventState makro.

Location:

code/trunk/src/modules/questsystem

Files:

• CMakeLists.txt (modified) (1 diff)
• QuestEffectBeacon.cc (modified) (5 diffs)
• QuestEffectBeacon.h (modified) (1 diff)

code/trunk/src/modules/questsystem/CMakeLists.txt

@@ -34 +34 @@
   LINK_LIBRARIES
     orxonox
+    objects
     overlays
   SOURCE_FILES ${QUESTSYSTEM_SRC_FILES}

code/trunk/src/modules/questsystem/QuestEffectBeacon.cc

@@ -39 +39 @@
 #include "worldentities/pawns/Pawn.h"
 #include "interfaces/PlayerTrigger.h"
+#include "objects/triggers/MultiTriggerContainer.h"
 #include "QuestEffect.h"
 
@@ -75 +76 @@
         XMLPortObject(QuestEffectBeacon, QuestEffect, "effects", addEffect, getEffect, xmlelement, mode);
 
-        XMLPortEventState(QuestEffectBeacon, PlayerTrigger, "execute", execute, xmlelement, mode);
+        XMLPortEventState(QuestEffectBeacon, BaseObject, "execute", execute, xmlelement, mode); //TODO: Change BaseObject to MultiTrigger as soon as MultiTrigger is the base of all triggers.
 
         COUT(3) << "New QuestEffectBeacon created." << std::endl;
@@ -84 +85 @@
         SUPER(QuestEffectBeacon, XMLEventPort, xmlelement, mode);
 
-        XMLPortEventState(QuestEffectBeacon, PlayerTrigger, "execute", execute, xmlelement, mode);
+        XMLPortEventSink(QuestEffectBeacon, BaseObject, "execute", execute, xmlelement, mode);
     }
 
@@ -92 +93 @@
         This means extracting the Pawn from the PlayerTrigger, provided by the Event causing the execution, and the extracting the PlayerInfo from the received Pawn and invoking the QuestEffectbeacon's QuestEffects on the received PlayerInfo.
     @param trigger
-        Apointer to the PlayerTrigger that threw the Event.
+        A pointer to the PlayerTrigger that threw the Event.
     @return
         Returns true if successfully executed, false if not.
     */
-    bool QuestEffectBeacon::execute(bool b, PlayerTrigger* trigger)
-    {
+    bool QuestEffectBeacon::execute(bool b, BaseObject* trigger)
+    {
+        //TODO: Remove debug output.
+        COUT(1) << "Debug: Calling execute on QuestEffectBeacon." << std::endl;
+        
         if(!b)
         {
@@ -108 +112 @@
         }
 
-        if(!trigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
-        {
-            return false;
-        }
-
-        //! Extracting the Pawn from the PlayerTrigger.
-        Pawn* pawn = trigger->getTriggeringPlayer();
+        PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
+        MultiTriggerContainer* mTrigger = orxonox_cast<MultiTriggerContainer*>(trigger);
+        Pawn* pawn = NULL;
+        
+        //! If the trigger is neither a Playertrigger nor a MultiTrigger (i.e. a MultitriggerContainer) we can do anything with it.
+        if(pTrigger == NULL && mTrigger == NULL)
+            return false;
+        
+        // If the trigger is a PlayerTrigger.        
+        if(pTrigger != NULL)
+        {
+            if(!pTrigger->isForPlayer())  //!< The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
+                return false;
+            else
+                pawn = pTrigger->getTriggeringPlayer();
+        }
+        
+        // If the trigger is a MultiTrigger (i.e. a MultiTriggerContainer)
+        if(mTrigger != NULL)
+        {
+            pawn = orxonox_cast<Pawn*>(mTrigger->getData());
+        }
 
         if(pawn == NULL)

code/trunk/src/modules/questsystem/QuestEffectBeacon.h

@@ -88 +88 @@
             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
-            bool execute(bool b, PlayerTrigger* trigger); //!< Executes the QuestEffects of the QuestEffectBeacon.
+            bool execute(bool b, BaseObject* trigger); //!< Executes the QuestEffects of the QuestEffectBeacon.
 
             /**