Author: silene
Date: Sun Apr 5 19:05:01 2009
New Revision: 34552
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34552&view=rev
Log:
Removed config::get_children.
Modified:
trunk/src/menu_events.cpp
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=34552&r1=34551&r2=34552&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Sun Apr 5 19:05:01 2009
@@ -740,11 +740,8 @@
game_events::write_events(start);
// Write terrain_graphics data in snapshot, too
- const config::child_list& terrains =
level_.get_children("terrain_graphics");
- for(config::child_list::const_iterator tg = terrains.begin();
- tg != terrains.end(); ++tg) {
-
- start.add_child("terrain_graphics", **tg);
+ foreach (const config &tg,
level_.child_range("terrain_graphics")) {
+ start.add_child("terrain_graphics", tg);
}
sound::write_music_play_list(start);
@@ -2917,15 +2914,14 @@
}
void console_handler::do_choose_level() {
std::vector<std::string> options;
- int next = 0;
- const config::child_list& scenarios =
- menu_handler_.game_config_.get_children("scenario");
- for (config::child_list::const_iterator i = scenarios.begin(),
- i_end = scenarios.end(); i != i_end; ++i) {
- const std::string id = (**i)["id"];
- options.push_back(id);
+ int next = 0, nb = 0;
+ foreach (const config &sc,
menu_handler_.game_config_.child_range("scenario"))
+ {
+ const std::string &id = sc["id"];
+ options.push_back(id);
if (id == menu_handler_.gamestate_.next_scenario)
- next = i - scenarios.begin();
+ next = nb;
+ ++nb;
}
int choice = 0;
{
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
