Changeset 2209

Timestamp:

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

Author:

dafrick

Message:

Resolved some issues with triggers.

Location:

code/branches/questsystem2/src/orxonox/objects

Files:

• quest/AddQuest.cc (modified) (2 diffs)
• quest/CompleteQuest.cc (modified) (2 diffs)
• quest/QuestEffectBeacon.cc (modified) (2 diffs)
• quest/QuestEffectBeacon.h (modified) (1 diff)
• worldentities/triggers/DistanceTrigger.cc (modified) (1 diff)

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

@@ -92 +92 @@
         }
 
+        COUT(3) << "AddQuest on player: " << player << " ." << std::endl;
+
         try
         {
@@ -106 +108 @@
         }
 
-        COUT(3) << "Quest {" << this->getQuestId() << "} successfully added to player." << std::endl;
+        COUT(3) << "Quest {" << this->getQuestId() << "} successfully added to player." << std::endl;
         return true;
     }

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

@@ -89 +89 @@
         }
 
+        COUT(3) << "CompleteQuest on player: " << player << " ." << std::endl;
+
+        Quest* quest;
+
         try
         {
-            Quest* quest = QuestManager::findQuest(this->getQuestId());
+            quest = QuestManager::findQuest(this->getQuestId());
             if(!quest->complete(player))
             {
@@ -103 +107 @@
         }
 
+        COUT(3) << "Quest {" << quest->getId() << "} successfully completed by player: " << player << " ." << std::endl;
         return true;
     }

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)

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

@@ -65 +65 @@
             virtual void processEvent(Event& event);
             
-            bool execute(bool b, ControllableEntity* player); //!< Executes the QuestEffects of the QuestEffectBeacon.
+            bool execute(bool b, PlayerTrigger* trigger); //!< Executes the QuestEffects of the QuestEffectBeacon.
             
             bool isActive(void); //!< Test whether the QuestEffectBeacon is active.

code/branches/questsystem2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -141 +141 @@
     if (Trigger::isTriggered(mode))
     {
-        COUT(3) << "Triggers" << std::endl;
       return checkDistance();
     }