Changeset 5687 for code/branches/libraries/src/orxonox

Timestamp:

Aug 29, 2009, 7:38:45 PM (15 years ago)

Author:

landauf

Message:

nothing important

Location:

code/branches/libraries/src/orxonox/objects

Files:

• quest/QuestListener.h (modified) (1 diff)
• worldentities/ForceField.h (modified) (1 diff)
• worldentities/triggers/PlayerTrigger.h (modified) (4 diffs)

code/branches/libraries/src/orxonox/objects/quest/QuestListener.h

@@ -64 +64 @@
         <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>

code/branches/libraries/src/orxonox/objects/worldentities/ForceField.h

@@ -43 +43 @@
         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);
 

code/branches/libraries/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

@@ -52 +52 @@
         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.
@@ -61 +61 @@
         inline Pawn* getTriggeringPlayer(void) const
             { return this->player_; }
-        
+
         /**
         @brief Checks whether the PlayerTrigger normally returns a ControllableEntity.
@@ -68 +68 @@
         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.
@@ -81 +81 @@
             /**
             @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.
+
     };