Changeset 7552 for code/trunk/src/modules/questsystem/QuestEffectBeacon.cc

Timestamp:

Oct 17, 2010, 10:50:43 PM (14 years ago)

Author:

dafrick

Message:

Resolving some TODOs and doing some additional cleanup. Almost done now…

File:

• code/trunk/src/modules/questsystem/QuestEffectBeacon.cc (modified) (5 diffs)

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

@@ -41 +41 @@
 #include "worldentities/pawns/Pawn.h"
 
-#include "objects/triggers/MultiTriggerContainer.h"
 #include "QuestEffect.h"
 
@@ -101 +100 @@
         Returns true if successfully executed, false if not.
     */
-    //TODO: Eliminate MultiTriggerContainer stuff, since they are now PlayerTriggers as well.
     bool QuestEffectBeacon::execute(bool bTriggered, BaseObject* trigger)
     {
@@ -115 +113 @@
 
         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.
@@ -130 +123 @@
                 pawn = pTrigger->getTriggeringPlayer();
         }
-
-        // If the trigger is a MultiTrigger (i.e. a MultiTriggerContainer)
-        if(mTrigger != NULL)
-        {
-            pawn = orxonox_cast<Pawn*>(mTrigger->getData());
-        }
+        else
+            return false;
 
         if(pawn == NULL)
@@ -237 +226 @@
     bool QuestEffectBeacon::addEffect(QuestEffect* effect)
     {
-        //TODO: Replace with assert.
-        if(effect == NULL) // NULL-pointers are not well liked here...
-        {
-            COUT(2) << "A NULL-QuestEffect was trying to be added" << std::endl;
-            return false;
-        }
+        assert(effect);
 
         this->effects_.push_back(effect);