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

Connect Engine: fixed leaving observers not being removed from controller option list

Browse source 
Fixes #2519. update_side_controller_options updates the actually values MP Staging uses in
its controller dropdown, so it should be updated regardless if the observer was assigned a
side or not.

Also stopped using a t_string reference for the name key... player names aren't translatable.
This commit is contained in:
Charles Dang 2018-02-23 17:56:15 +11:00
parent d256a7b609
commit 855473f36c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game_initialization/connect_engine.cpp
View file

@ -741,14 +741,15 @@ std::pair<bool, bool> connect_engine::process_network_data(const config& data)
}
if(const config& observer = data.child("observer_quit")) {
const t_string& observer_name = observer["name"];
const std::string& observer_name = observer["name"];
if(connected_users().find(observer_name) != connected_users().end()) {
connected_users_rw().erase(observer_name);
update_side_controller_options();
// If the observer was assigned a side, we need to update the controllers.
// If the observer was assigned a side, we need to send an update to other
// players so they no longer see the observer assigned to that side.
if(find_user_side_index_by_id(observer_name) != -1) {
update_side_controller_options();
update_and_send_diff();
}
}