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

wesnothd: Fix remaining incorrect uses of simple_wml::get_attr instead of get_attr_dup

Browse source
This commit is contained in:
loonycyborg 2018-05-03 12:12:58 +03:00
parent aa772cbe5d
commit 0a2103b146
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/server/game.cpp
View file

@ -636,11 +636,11 @@ void game::change_controller(
simple_wml::document response;
simple_wml::node& change = response.root().add_child("change_controller");
change.set_attr("side", side.c_str());
change.set_attr("player", player_name.c_str());
change.set_attr_dup("side", side.c_str());
change.set_attr_dup("player", player_name.c_str());
// Tell everyone but the new player that this side's controller changed.
change.set_attr("controller", side_controllers_[side_index].to_cstring());
change.set_attr_dup("controller", side_controllers_[side_index].to_cstring());
change.set_attr("is_local", "no");
send_data(response, sock);
@ -1066,7 +1066,7 @@ bool game::process_turn(simple_wml::document& data, const socket_ptr& user)
if(side_index < sides_.size()) {
simple_wml::document cfg;
std::string playername;
cfg.root().set_attr("side", std::to_string(side_index + 1).c_str());
cfg.root().set_attr_dup("side", std::to_string(side_index + 1).c_str());
// figure out who gets the surrendered side
if(owner_ == user) {
@ -1075,7 +1075,7 @@ bool game::process_turn(simple_wml::document& data, const socket_ptr& user)
playername = username(owner_);
}
cfg.root().set_attr("player", playername.c_str());
cfg.root().set_attr_dup("player", playername.c_str());
transfer_side_control(user, cfg.root());
}
send_and_record_server_message(username(user) + " has surrendered.");
@ -1208,7 +1208,7 @@ void game::handle_controller_choice(const simple_wml::node& req)
simple_wml::node& command = turn.add_child("command");
simple_wml::node& change_controller_wml = command.add_child("change_controller_wml");
change_controller_wml.set_attr("controller", new_controller.to_cstring());
change_controller_wml.set_attr_dup("controller", new_controller.to_cstring());
change_controller_wml.set_attr("is_local", "yes");
command.set_attr("from_side", "server");
@ -1540,8 +1540,8 @@ bool game::remove_player(const socket_ptr& player, const bool disconnect, const
simple_wml::document drop;
auto& node_side_drop = drop.root().add_child("side_drop");
node_side_drop.set_attr("side_num", side_drop.c_str());
node_side_drop.set_attr("controller", side_controllers_[side_index].to_cstring());
node_side_drop.set_attr_dup("side_num", side_drop.c_str());
node_side_drop.set_attr_dup("controller", side_controllers_[side_index].to_cstring());
DBG_GAME << "*** sending side drop: \n" << drop.output() << std::endl;
@ -1576,7 +1576,7 @@ void game::send_user_list(const socket_ptr& exclude) const
// Don't need to duplicate pl->info().name().c_str() because the
// document will be destroyed by the end of the function
user.set_attr("name", pl->info().name().c_str());
user.set_attr_dup("name", pl->info().name().c_str());
user.set_attr("host", is_owner(user_ptr) ? "yes" : "no");
user.set_attr("observer", is_observer(user_ptr) ? "yes" : "no");
}
@ -1736,7 +1736,7 @@ void game::send_observerquit(const socket_ptr& observer) const
// Don't need to dup the attribute because this document is short-lived.
observer_quit.root()
.add_child("observer_quit")
.set_attr("name", player_connections_.find(observer)->info().name().c_str());
.set_attr_dup("name", player_connections_.find(observer)->info().name().c_str());
send_data(observer_quit, observer);
}