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

properly consider players that have more than one side

Browse source 
(cherry picked from commit 2009-02-01T11:46:41Z!soliton@wesnoth.org)
This commit is contained in:
Gunter Labes 2009-02-01 12:42:33 +00:00
parent 029a6d1921
commit 3a10620fea
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/server/game.cpp
View file

@ -1105,17 +1105,14 @@ void game::send_data_observers(simple_wml::document& data, const network::connec
}
bool game::is_on_team(const simple_wml::string_span& team, const network::connection player) const {
side_vector::const_iterator side = std::find(sides_.begin(), sides_.end(), player);
if(side == sides_.end()) {
return false;
}
const std::string side_str =
lexical_cast<std::string, size_t>(side - sides_.begin() + 1);
const simple_wml::node::child_list& side_list = level_.root().children("side");
for(simple_wml::node::child_list::const_iterator i = side_list.begin();
i != side_list.end(); ++i) {
if((**i)["side"] == side_str.c_str()) {
return (**i)["team_name"] == team;
for (side_vector::const_iterator side = std::find(sides_.begin(), sides_.end(), player);
side != sides_.end(); ++side) {
for (simple_wml::node::child_list::const_iterator i = side_list.begin();
i != side_list.end(); ++i) {
if ((**i)["side"].to_int() == side - sides_.begin() + 1) {
if ((**i)["team_name"] == team) return true;
}
}
}