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

Fix "Shuffle sides" incorrect behaviour.

Browse source
This commit is contained in:
Andrius Silinskas 2013-05-30 11:18:55 +01:00
parent b32ca5c390
commit d49b183fb1
3 changed files with 2 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -26,6 +26,8 @@ Version 1.11.4+dev:
* Added new aspect 'advancements' which with lua engine can handle a
function return type of the form f(x, y) -> String. 'advancements'
tells the AI to what unit a given unit should advance to.
* Fix "Shuffle sides" incorrect behaviour: children inside [side] were also
swapped.
Version 1.11.4:
* AI:

37
src/multiplayer_connect.cpp
View file

@ -814,39 +814,6 @@ void connect::side::set_team(int team)
team_ = team;
}
std::vector<std::string> connect::side::get_children_to_swap()
{
std::vector<std::string> children;
children.push_back("village");
children.push_back("unit");
children.push_back("ai");
return children;
}
std::map<std::string, config> connect::side::get_side_children()
{
std::map<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))
children.insert(std::pair<std::string, config>(children_to_swap, child));
return children;
}
void connect::side::set_side_children(std::map<std::string, config> children)
{
BOOST_FOREACH(const std::string& children_to_remove, get_children_to_swap())
cfg_.clear_children(children_to_remove);
std::pair<std::string, config> child_map;
BOOST_FOREACH(child_map, children)
cfg_.add_child(child_map.first, child_map.second);
}
void connect::side::set_ready_for_start(bool ready_for_start)
{
ready_for_start_ = ready_for_start;
@ -1241,10 +1208,6 @@ void connect::start_game()
sides_[j_side].set_team(sides_[i_side].get_team());
sides_[i_side].set_team(tmp_team);
std::map<std::string, config> tmp_side_children = sides_[j_side].get_side_children();
sides_[j_side].set_side_children(sides_[i_side].get_side_children());
sides_[i_side].set_side_children(tmp_side_children);
// This is needed otherwise fog bugs will appear
side tmp_side = sides_[j_side];
sides_[j_side] = sides_[i_side];

6
src/multiplayer_connect.hpp
View file

@ -110,12 +110,6 @@ public:
void set_team(int 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);
/**
* Imports data from the network into this side, and updates the UI
* accordingly.