0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix some redefinition errors

Browse source 
http://www.wesnoth.org/wiki/CodingStandards#Respect_for_loop_scoping_of_different_platforms
This commit is contained in:
Patrick Parker 2007-12-02 20:39:26 +00:00
parent d57c99fd02
commit 23f4463a6f
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dialogs.cpp
View file

@ -903,8 +903,8 @@ const unit_types_preview_pane::details unit_types_preview_pane::get_details() co
// FIXME: not sure if it's fully accurate (but not very important for unit_type) // FIXME: not sure if it's fully accurate (but not very important for unit_type)
// xp_color also need a simpler function for doing this // xp_color also need a simpler function for doing this
const config::child_list& advances = t->modification_advancements(); const config::child_list& advances = t->modification_advancements();
for(config::child_list::const_iterator i = advances.begin(); i != advances.end(); ++i) { for(config::child_list::const_iterator j = advances.begin(); j != advances.end(); ++j) {
if (!utils::string_bool((**i)["strict_amla"]) || !t->can_advance()) { if (!utils::string_bool((**j)["strict_amla"]) || !t->can_advance()) {
det.xp_color = "<100,0,150>"; // from unit::xp_color() det.xp_color = "<100,0,150>"; // from unit::xp_color()
break; break;
} }

10
src/theme.cpp
View file

@ -536,7 +536,8 @@ bool theme::set_resolution(const SDL_Rect& screen)
} }
std::map<std::string,std::string> title_stash; std::map<std::string,std::string> title_stash;
for (std::vector<theme::menu>::iterator m = menus_.begin(); m != menus_.end(); ++m) { std::vector<theme::menu>::iterator m;
for (m = menus_.begin(); m != menus_.end(); ++m) {
if (!m->title().empty() && !m->get_id().empty()) if (!m->title().empty() && !m->get_id().empty())
title_stash[m->get_id()] = m->title(); title_stash[m->get_id()] = m->title();
} }
@ -549,7 +550,7 @@ bool theme::set_resolution(const SDL_Rect& screen)
const config& cfg = **current; const config& cfg = **current;
add_object(cfg); add_object(cfg);
for (std::vector<theme::menu>::iterator m = menus_.begin(); m != menus_.end(); ++m) { for (m = menus_.begin(); m != menus_.end(); ++m) {
if (title_stash.find(m->get_id()) != title_stash.end()) if (title_stash.find(m->get_id()) != title_stash.end())
m->set_title(title_stash[m->get_id()]); m->set_title(title_stash[m->get_id()]);
} }
@ -656,7 +657,8 @@ void theme::set_object_location(theme::object& element, std::string rect_str, st
void theme::modify(const config* cfg){ void theme::modify(const config* cfg){
std::map<std::string,std::string> title_stash; std::map<std::string,std::string> title_stash;
for (std::vector<theme::menu>::iterator m = menus_.begin(); m != menus_.end(); ++m) { std::vector<theme::menu>::iterator m;
for (m = menus_.begin(); m != menus_.end(); ++m) {
if (!m->title().empty() && !m->get_id().empty()) if (!m->title().empty() && !m->get_id().empty())
title_stash[m->get_id()] = m->title(); title_stash[m->get_id()] = m->title();
} }
@ -687,7 +689,7 @@ void theme::modify(const config* cfg){
remove_object((**j)["id"]); remove_object((**j)["id"]);
} }
} }
for (std::vector<theme::menu>::iterator m = menus_.begin(); m != menus_.end(); ++m) { for (m = menus_.begin(); m != menus_.end(); ++m) {
if (title_stash.find(m->get_id()) != title_stash.end()) if (title_stash.find(m->get_id()) != title_stash.end())
m->set_title(title_stash[m->get_id()]); m->set_title(title_stash[m->get_id()]);
} }