[Orxonox-commit 1220] r5938 - code/trunk/src/modules/questsystem

[dafrick at orxonox.net]

Author: dafrick
Date: 2009-10-13 22:17:01 +0200 (Tue, 13 Oct 2009)
New Revision: 5938

Modified:
   code/trunk/src/modules/questsystem/QuestEffectBeacon.cc
   code/trunk/src/modules/questsystem/QuestEffectBeacon.h
Log:
Some more updated documentation, this time in QuestEffectBeacon.

Modified: code/trunk/src/modules/questsystem/QuestEffectBeacon.cc
===================================================================
--- code/trunk/src/modules/questsystem/QuestEffectBeacon.cc	2009-10-13 19:52:52 UTC (rev 5937)
+++ code/trunk/src/modules/questsystem/QuestEffectBeacon.cc	2009-10-13 20:17:01 UTC (rev 5938)
@@ -89,7 +89,7 @@
     /**
     @brief
         Executes the QuestEffectBeacon.
-        This means extracting the ControllableEntity from the PlayerTrigger, provided by the Event causing the execution, and the extracting the PlayerInfo from the received ControllableEntity and invoking the QuestEffectbeacon's QuestEffects on the received PlayerInfo.
+        This means extracting the Pawn from the PlayerTrigger, provided by the Event causing the execution, and the extracting the PlayerInfo from the received Pawn and invoking the QuestEffectbeacon's QuestEffects on the received PlayerInfo.
     @param trigger
         Apointer to the PlayerTrigger that threw the Event.
     @return
@@ -107,12 +107,12 @@
             return false;
         }
 
-        if(!trigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for ControllableEntities which means we cannot extract one.
+        if(!trigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
         {
             return false;
         }
 
-        //! Extracting the ControllableEntity form the PlayerTrigger.
+        //! Extracting the Pawn from the PlayerTrigger.
         Pawn* pawn = trigger->getTriggeringPlayer();
 
         if(pawn == NULL)
@@ -121,7 +121,7 @@
             return false;
         }
 
-        //! Extract the PlayerInfo from the ControllableEntity.
+        //! Extract the PlayerInfo from the Pawn.
         PlayerInfo* player = pawn->getPlayer();
 
         if(player == NULL)

Modified: code/trunk/src/modules/questsystem/QuestEffectBeacon.h
===================================================================
--- code/trunk/src/modules/questsystem/QuestEffectBeacon.h	2009-10-13 19:52:52 UTC (rev 5937)
+++ code/trunk/src/modules/questsystem/QuestEffectBeacon.h	2009-10-13 20:17:01 UTC (rev 5938)
@@ -113,7 +113,7 @@
 
             std::list<QuestEffect*> effects_; //!< The list of QuestEffects to be invoked on the executing player.
             int times_; //!< Number of times the beacon can be exectued.
-            QuestEffectBeaconStatus::Value status_; //!< The status of the QUestEffectBeacon, Can be eighter active or inactive.
+            QuestEffectBeaconStatus::Value status_; //!< The status of the QuestEffectBeacon, Can be eighter active or inactive.
 
             bool setTimes(const int & n); //!< Set the number of times the QuestEffectBeacon can be executed.
             bool addEffect(QuestEffect* effect); //!< Add a QuestEffect to the QuestEffectBeacon.