Changeset 2209 for code/branches/questsystem2/src/orxonox/objects/quest/QuestEffectBeacon.cc

Timestamp:

Nov 14, 2008, 2:55:55 PM (15 years ago)

Author:

dafrick

Message:

Resolved some issues with triggers.

File:

• code/branches/questsystem2/src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) (2 diffs)

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

@@ -71 +71 @@
     }
     
-    bool QuestEffectBeacon::execute(bool b, ControllableEntity* entity)
-    {
-        if(!b || !(this->isActive()))
+    bool QuestEffectBeacon::execute(bool b, PlayerTrigger* trigger)
+    {
+        if(!b)
+        {
+            COUT(2) << "b is false." << std::endl;
+        }
+        if(!(this->isActive()))
         {
             COUT(3) << "The QuestEffectBeacon is inactive." << std::endl;
             return false;
         }
+
+        ControllableEntity* entity = trigger->getTriggeringPlayer();
+
         if(entity == NULL)
         {
@@ -91 +98 @@
             return false;
         }
-        
+
+        COUT(3) << "QuestEffectBeacon executed on player: " << player << " ." << std::endl;        
+
         bool check = QuestEffect::invokeEffects(player, this->effects_);
         if(check)