Changeset 6536 for code/trunk/src/modules

Timestamp:

Mar 16, 2010, 11:22:36 AM (15 years ago)

Author:

rgrieder

Message:

Merged revisions 6430-6440 from the gamestate branch to the trunk.
This adds keybindings merging functionality.

(from log of r6437)
When running development builds, the keybinder will merge the local file and the one from the data folder.
Catch: if you want to remove a binding, you'll have to write "NoBinding" (not case sensitive) to override the default command

The keybind command already does that for you though.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/questsystem/QuestManager.cc (modified) (2 diffs)
• src/modules/questsystem/QuestManager.h (modified) (3 diffs)

code/trunk/src/modules/questsystem/QuestManager.cc

@@ -235 +235 @@
     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.
@@ -253 +253 @@
         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);

code/trunk/src/modules/questsystem/QuestManager.h

@@ -52 +52 @@
     /**
     @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
@@ -72 +72 @@
             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
 
@@ -82 +82 @@
 
         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.