Changeset 2021 for code/branches/questsystem/src/orxonox/objects/QuestEffect.cc

Timestamp:

Oct 27, 2008, 8:31:20 PM (16 years ago)

Author:

dafrick

Message:

Nearly compiles, some minor improvements.

File:

• code/branches/questsystem/src/orxonox/objects/QuestEffect.cc (modified) (2 diffs)

code/branches/questsystem/src/orxonox/objects/QuestEffect.cc

@@ -28 +28 @@
 
 #include "core/CoreIncludes.h"
+
 #include "QuestEffect.h"
 
 namespace orxonox {
-
-    CreateFactory(QuestEffect);
 
     /**
@@ -61 +60 @@
         A list of all the effects to be invoked.
     */
-    void QuestEffect::invokeEffects(Player & player, std::list<QuestEffect> & effects)
+    void QuestEffect::invokeEffects(Player* player, std::list<QuestEffect*> & effects)
     {
-        if ( effects == NULL )
-        {
-            COUT(5) << "NULL-QuestEffect list encountered." << std::endl;
-            return;
-        }
-        for ( std::list<QuestEffect>::iterator = effects.begin(); effect != effects.end(); ++effect )
+        for (std::list<QuestEffect*>::iterator effect = effects.begin(); effect != effects.end(); effect++)
         {
-            effect.invoke(player);
+            (*effect)->invoke(player);
         }
     }