[Orxonox-commit 1722] r6440 - code/branches/gamestate/src/modules/questsystem

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-01-03 15:55:39 +0100 (Sun, 03 Jan 2010)
New Revision: 6440

Modified:
   code/branches/gamestate/src/modules/questsystem/QuestManager.cc
   code/branches/gamestate/src/modules/questsystem/QuestManager.h
Log:
Fixed typos.

Modified: code/branches/gamestate/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/gamestate/src/modules/questsystem/QuestManager.cc	2010-01-03 14:54:34 UTC (rev 6439)
+++ code/branches/gamestate/src/modules/questsystem/QuestManager.cc	2010-01-03 14:55:39 UTC (rev 6440)
@@ -234,7 +234,7 @@
     */
     CEGUI::Window* QuestManager::getQuestGUI(const std::string & guiName)
     {
-        PlayerInfo* player = this->retreivePlayer(guiName);
+        PlayerInfo* player = this->retrievePlayer(guiName);
 
         if(this->questGUIs_.find(player) == this->questGUIs_.end()) //!< Create a new GUI, if there is none, yet.
             this->questGUIs_[player] = new QuestGUI(player);
@@ -252,7 +252,7 @@
     @todo
         This very well might be outdated. So: Check if still needed, and update if necessary.
     */
-    PlayerInfo* QuestManager::retreivePlayer(const std::string & guiName)
+    PlayerInfo* QuestManager::retrievePlayer(const std::string & guiName)
     {
         PlayerInfo* player = GUIManager::getInstance().getPlayer(guiName);
         if(player == NULL)

Modified: code/branches/gamestate/src/modules/questsystem/QuestManager.h
===================================================================
--- code/branches/gamestate/src/modules/questsystem/QuestManager.h	2010-01-03 14:54:34 UTC (rev 6439)
+++ code/branches/gamestate/src/modules/questsystem/QuestManager.h	2010-01-03 14:55:39 UTC (rev 6440)
@@ -51,7 +51,7 @@
 {
     /**
     @brief
-        Is a Singleton and manages Quests, by registering every Quest/QuestHint (through registerX()) and making them globally accessable (through findX()).
+        Is a Singleton and manages Quests, by registering every Quest/QuestHint (through registerX()) and making them globally accessible (through findX()).
         Quests (and QuestHints) are registered in the QuestManager with their id, and can be accessed in the same way.
     @author
         Damian 'Mozork' Frick
@@ -71,7 +71,7 @@
             //! Returns a reference to the single instance of the Quest Manager.
             static QuestManager& getInstance() { return Singleton<QuestManager>::getInstance(); } // tolua_export
 
-            //! Retreive the main window for the GUI.
+            //! Retrieve the main window for the GUI.
             CEGUI::Window* getQuestGUI(const std::string & guiName); // tolua_export
 
             bool registerQuest(Quest* quest); //!< Registers a Quest in the QuestManager.
@@ -81,11 +81,11 @@
             QuestHint* findHint(const std::string & hintId); //!< Returns the QuestHint with the input id.
 
         protected:
-            std::map<std::string, Quest*> & getQuests(void); //!< Retreive all Quests.
+            std::map<std::string, Quest*> & getQuests(void); //!< Retrieve all Quests.
 
         private:
             static QuestManager* singletonPtr_s;
-            PlayerInfo* retreivePlayer(const std::string & guiName); //!< Retrieve the player for a certain GUI.
+            PlayerInfo* retrievePlayer(const std::string & guiName); //!< Retrieve the player for a certain GUI.
 
             std::map<std::string, Quest*> questMap_; //!< All Quests registered by their id's.
             std::map<std::string, QuestHint*> hintMap_; //!< All QuestHints registered by their id's.