upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 17:51:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shuffle sides use multimap instead of map for side child variables.

Browse Source
This commit is contained in:
David Mikos 2013-10-27 22:30:12 +10:30
parent f1d46a7a95
commit 4b531850da
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/multiplayer_connect_engine.cpp
View File

@ -379,9 +379,9 @@ std::vector<std::string> side_engine::get_children_to_swap()
return children;
}
std::map<std::string, config> side_engine::get_side_children()
std::multimap<std::string, config> side_engine::get_side_children()
{
std::map<std::string, config> children;
std::multimap<std::string, config> children;
BOOST_FOREACH(const std::string& children_to_swap, get_children_to_swap())
BOOST_FOREACH(const config& child, cfg_.child_range(children_to_swap))
@ -390,7 +390,7 @@ std::map<std::string, config> side_engine::get_side_children()
return children;
}
void side_engine::set_side_children(std::map<std::string, config> children)
void side_engine::set_side_children(std::multimap<std::string, config> children)
{
BOOST_FOREACH(const std::string& children_to_remove, get_children_to_swap())
cfg_.clear_children(children_to_remove);
@ -401,6 +401,7 @@ void side_engine::set_side_children(std::map<std::string, config> children)
cfg_.add_child(child_map.first, child_map.second);
}
void connect_engine::start_game(LOAD_USERS load_users)
{
DBG_MP << "starting a new game" << std::endl;
@ -430,6 +431,8 @@ void connect_engine::start_game(LOAD_USERS load_users)
int j_side = playable_sides[get_random() % i];
int i_side = playable_sides[i - 1];
if (i_side == j_side) continue; //nothing to swap
// First we swap fields that are unique to the player
int tmp_index = side_engines_[j_side]->index();
side_engines_[j_side]->set_index(side_engines_[i_side]->index());
@ -439,7 +442,7 @@ void connect_engine::start_game(LOAD_USERS load_users)
side_engines_[j_side]->set_team(side_engines_[i_side]->team());
side_engines_[i_side]->set_team(tmp_team);
std::map<std::string, config> tmp_side_children = side_engines_[j_side]->get_side_children();
std::multimap<std::string, config> tmp_side_children = side_engines_[j_side]->get_side_children();
side_engines_[j_side]->set_side_children(side_engines_[i_side]->get_side_children());
side_engines_[i_side]->set_side_children(tmp_side_children);

4
src/multiplayer_connect_engine.hpp
View File

@ -177,8 +177,8 @@ public:
int team() const { return team_; }
void set_team(int team) { team_ = team; }
std::vector<std::string> get_children_to_swap();
std::map<std::string, config> get_side_children();
void set_side_children(std::map<std::string, config> children);
std::multimap<std::string, config> get_side_children();
void set_side_children(std::multimap<std::string, config> children);
int color() const { return color_; }
void set_color(int color) { color_ = color; }
int gold() const { return gold_; }