Changeset 6400 for code/branches/presentation2/src/modules
- Timestamp:
- Dec 22, 2009, 10:05:38 PM (15 years ago)
- Location:
- code/branches/presentation2/src/modules
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/presentation2/src/modules/overlays/hud/HUDBar.cc
r6394 r6400 122 122 { 123 123 ColourValue colour1(0, 0, 0, 1); 124 ColourValue colour2 = (*this->colours_.rbegin()).second;124 ColourValue colour2 = this->colours_.rbegin()->second; 125 125 float value1(0); 126 float value2 = (*this->colours_.rbegin()).first;126 float value2 = this->colours_.rbegin()->first; 127 127 for (std::map<float, ColourValue>::reverse_iterator it = this->colours_.rbegin(); it != this->colours_.rend(); ++it) 128 128 { 129 129 colour1 = colour2; 130 130 value1 = value2; 131 colour2 = (*it).second;132 value2 = (*it).first;131 colour2 = it->second; 132 value2 = it->first; 133 133 134 134 if (value2 < this->value_) -
code/branches/presentation2/src/modules/pong/PongAI.cc
r6387 r6400 62 62 { 63 63 for (std::list<std::pair<Timer*, char> >::iterator it = this->reactionTimers_.begin(); it != this->reactionTimers_.end(); ++it) 64 (*it).first->destroy();64 it->first->destroy(); 65 65 } 66 66 -
code/branches/presentation2/src/modules/questsystem/QuestGUI.cc
r6388 r6400 116 116 for(std::map<std::string, Quest*>::iterator it = quests.begin(); it != quests.end(); it++) 117 117 { 118 Quest* quest = (*it).second;118 Quest* quest = it->second; 119 119 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. 120 120 { … … 136 136 for(std::map<CEGUI::Window*, QuestGUINode*>::iterator it = this->nodes_.begin(); it != this->nodes_.end(); it++) 137 137 { 138 QuestGUINode* node = (*it).second;138 QuestGUINode* node = it->second; 139 139 if(node == NULL) 140 140 { … … 209 209 for(std::map<PlayerInfo*, QuestGUI*>::iterator it = QuestManager::getInstance().questGUIs_.begin(); it != QuestManager::getInstance().questGUIs_.end(); it++) 210 210 { 211 QuestGUI* gui = (*it).second;211 QuestGUI* gui = it->second; 212 212 std::map<CEGUI::Window*, QuestGUINode*>::iterator node = gui->nodes_.find(window); 213 213 if(node != gui->nodes_.end()) return node->second; -
code/branches/presentation2/src/modules/questsystem/QuestManager.cc
r6182 r6400 76 76 for(std::map<PlayerInfo*, QuestGUI*>::iterator it = this->questGUIs_.begin(); it != this->questGUIs_.end(); it++) 77 77 { 78 (*it).second->destroy();78 it->second->destroy(); 79 79 } 80 80 this->questGUIs_.clear();
Note: See TracChangeset
for help on using the changeset viewer.