[Orxonox-commit 964] r5687 - in code/branches/libraries/src/orxonox/objects: quest worldentities worldentities/triggers

[landauf at orxonox.net]

Author: landauf
Date: 2009-08-29 19:38:45 +0200 (Sat, 29 Aug 2009)
New Revision: 5687

Modified:
   code/branches/libraries/src/orxonox/objects/quest/QuestListener.h
   code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h
   code/branches/libraries/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h
Log:
nothing important

Modified: code/branches/libraries/src/orxonox/objects/quest/QuestListener.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/quest/QuestListener.h	2009-08-29 16:37:04 UTC (rev 5686)
+++ code/branches/libraries/src/orxonox/objects/quest/QuestListener.h	2009-08-29 17:38:45 UTC (rev 5687)
@@ -63,7 +63,7 @@
 
         <BaseObject> // The object that should react to the status change of a Quest.
             <events>
-                <function> // Where function is the method of the object that schould be executed. Normally this would be visibility or activity.
+                <function> // Where function is the method of the object that should be executed. Normally this would be visibility or activity.
                     <QuestListener questId="someQuestId" mode="someMode" /> // Where someQuestId is the identifier for the Quest the QuestListener is reacting to, and someMode is the kind of status change the QUestListener reacts to (all, start, complete or fail).
                 </function>
             </events>

Modified: code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h	2009-08-29 16:37:04 UTC (rev 5686)
+++ code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h	2009-08-29 17:38:45 UTC (rev 5687)
@@ -42,7 +42,7 @@
     public:
         ForceField(BaseObject* creator);
         virtual ~ForceField();
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a CheckPoint object through XML.
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
         virtual void tick(float dt);
 
         inline void setVelocity(float vel)

Modified: code/branches/libraries/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h
===================================================================
--- code/branches/libraries/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h	2009-08-29 16:37:04 UTC (rev 5686)
+++ code/branches/libraries/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h	2009-08-29 17:38:45 UTC (rev 5687)
@@ -51,26 +51,26 @@
     public:
         PlayerTrigger(BaseObject* creator);
         virtual ~PlayerTrigger();
-        
+
         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
-        
+
         /**
         @brief Returns the player that triggered the PlayerTrigger.
         @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
         */
         inline Pawn* getTriggeringPlayer(void) const
             { return this->player_; }
-        
+
         /**
         @brief Checks whether the PlayerTrigger normally returns a ControllableEntity.
         @return Returns true if the PlayerTrigger normally returns a ControllableEntity.
         */
         inline bool isForPlayer(void) const
            { return this->isForPlayer_; }
-            
+
     protected:
         virtual bool isTriggered(TriggerMode::Value mode) = 0;
-        
+
         /**
         @brief Set the player that triggered the PlayerTrigger. This is normally done by classes inheriting vom PlayerTrigger.
         @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
@@ -80,15 +80,15 @@
 
             /**
             @brief Set whether the PlayerTrigger normally is triggered by ControllableEntities.
-            @param isForPlayer Should be true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities, false if not.
+            @param isForPlayer Should be true when the PlayerTrigger should be set to normally be triggered by ControllableEntities, false if not.
             */
         inline void setForPlayer(bool isForPlayer)
            { this->isForPlayer_ = isForPlayer; }
-        
+
     private:
         Pawn* player_; //!< The player that triggered the PlayerTrigger.
-        bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.
-    
+        bool isForPlayer_; //!< Is true when the PlayerTrigger should be set to normally be triggered by ControllableEntities.
+
     };
 
 }