Changeset 2530 for code/branches/bugger/src/orxonox/objects/quest/QuestEffect.cc

Timestamp:

Dec 23, 2008, 10:40:38 PM (16 years ago)

Author:

rgrieder

Message:

merged revisions 2260 - 2508 from trunk to buggy.
I'm sorry that I have to commit every merge. But otherwise I get tons of conflicts I have to solve ten times over.
Note: did not merge deletion of src/util/testing, tortoise wasn't very friendly with that.

Location:

code/branches/bugger

Files:

• . (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (2 diffs, 1 prop)

code/branches/bugger/src/orxonox/objects/quest/QuestEffect.cc

@@ -27 +27 @@
  */
 
+/**
+    @file QuestEffect.cc
+    @brief
+    Implementation of the QuestEffect class.
+*/
+
 #include "OrxonoxStableHeaders.h"
 #include "QuestEffect.h"
 
 #include "core/CoreIncludes.h"
+
+#include "orxonox/objects/infos/PlayerInfo.h"
 
 namespace orxonox {
@@ -55 +63 @@
     /**
     @brief
-        Static method. Invoke all effects of an effect list.
+        Static method. Invoke all QuestEffects in an QuestEffect-list on a given player.
     @param player
-        The player the effects are invoked on.
+        The player the QuestEffects are invoked on.
     @param effects
-        A list of all the effects to be invoked.
+        A list of all the QuestEffects to be invoked.
     @return
         Returns false if there was an error, view console of log for further detail.
     */
-    bool QuestEffect::invokeEffects(Player* player, std::list<QuestEffect*> & effects)
+    bool QuestEffect::invokeEffects(PlayerInfo* player, std::list<QuestEffect*> & effects)
     {
         bool check = true;