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

more lobby player list update fixes

Browse source
This commit is contained in:
Tomasz Śniatowski 2009-07-23 19:40:11 +01:00
parent 13b2f41b91
commit 86723b7645
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/gui/dialogs/lobby_main.cpp
View file

@ -806,19 +806,28 @@ void tlobby_main::process_room_join(const config &data)
const std::string& room = data["room"];
const std::string& player = data["player"];
room_info* r = lobby_info_.get_room(room);
if (r) {
if (player == preferences::login()) {
//parse full userlist
if (const config& members = data.child("members")) {
r->process_room_members(members);
}
} else {
r->add_member(player);
//update userlists
//check the show-lobby-joins param
}
if (r == active_window_room()) {
update_playerlist();
}
} else {
if (player == preferences::login()) {
tlobby_chat_window* t = room_window_open(room, true);
switch_to_window(t);
lobby_info_.open_room(room);
r = lobby_info_.get_room(room);
assert(r);
if (const config& members = data.child("members")) {
r->process_room_members(members);
}
switch_to_window(t);
} else {
LOG_NW << "Discarding join info for a room the player is not in\n";
}

8
src/lobby_data.cpp
View file

@ -90,6 +90,14 @@ void room_info::remove_member(const std::string& user)
members_.erase(user);
}
void room_info::process_room_members(const config& data)
{
members_.clear();
foreach (const config& m, data.child_range("member")) {
members_.insert(m["name"]);
}
}
user_info::user_info()
: name()
, game_id()