Changeset 6417 for code/trunk/src/modules/questsystem/QuestGUI.cc

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/questsystem/QuestGUI.cc (modified) (7 diffs)

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

@@ -77 +77 @@
         }
         this->windows_.clear();
-        
+
         if(this->root_ != NULL)
             this->root_->destroy();
@@ -104 +104 @@
 
         this->clear(); //!< Clear the GUI.
-        
+
         int depth = 0;
         int index = 0;
@@ -116 +116 @@
         for(std::map<std::string, Quest*>::iterator it = quests.begin(); it != quests.end(); it++)
         {
-            Quest* quest = (*it).second;
+            Quest* quest = it->second;
             if(quest->getParentQuest() == NULL && !quest->isInactive(this->player_)) //!< If the Quest isn't inactive and a root Quest (meaning it has no parent.), create a Node.
             {
@@ -136 +136 @@
         for(std::map<CEGUI::Window*, QuestGUINode*>::iterator it = this->nodes_.begin(); it != this->nodes_.end(); it++)
         {
-            QuestGUINode* node = (*it).second;
+            QuestGUINode* node = it->second;
             if(node == NULL)
             {
@@ -209 +209 @@
         for(std::map<PlayerInfo*, QuestGUI*>::iterator it = QuestManager::getInstance().questGUIs_.begin(); it != QuestManager::getInstance().questGUIs_.end(); it++)
         {
-            QuestGUI* gui = (*it).second;
+            QuestGUI* gui = it->second;
             std::map<CEGUI::Window*, QuestGUINode*>::iterator node = gui->nodes_.find(window);
             if(node != gui->nodes_.end()) return node->second;
@@ -235 +235 @@
 
         this->nodes_.insert(std::pair<CEGUI::Window*, QuestGUINode*>(node->getWindow(),node)); //!< Insert the node and its window in the nodes_ map.
-        
+
         index++;
 
@@ -268 +268 @@
         index = tempIndex; //!< Reset the index to the original level.
 
-        return index;        
+        return index;
     }