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

send lobby diffs separately;...

Browse source 
...fixes bug #13099: MP lobby player list becomes inaccurate over time
This commit is contained in:
Gunter Labes 2009-03-03 09:38:03 +00:00
parent 5e867e21f9
commit e2b087cec7
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -7,6 +7,7 @@ Version 1.4.7+svn:
* multiplayer:
* server:
* create the fifo group accessible (instead of only user accessible)
* fixed bug #13099: MP lobby player list becomes inaccurate over time
* miscellaneous and bug fixes:
* AmigaOS4: Minimum stack cookie to prevent stack overflow (patch #1107)
* Additional screenmodes for when SDL can't guess them (patch #1108)

11
src/server/server.cpp
View file

@ -1722,10 +1722,9 @@ void server::delete_game(std::vector<wesnothd::game*>::iterator game_it) {
// Send a diff of the gamelist with the game deleted to players in the lobby
simple_wml::document diff;
bool send_diff = false;
if(make_delete_diff(*gamelist, "gamelist", "game",
(*game_it)->description(), diff)) {
send_diff = true;
lobby_.send_data(diff);
}
// Delete the game from the games_and_users_list_.
@ -1748,18 +1747,16 @@ void server::delete_game(std::vector<wesnothd::game*>::iterator game_it) {
const wesnothd::player_map::iterator pl = players_.find(*user);
if (pl != players_.end()) {
pl->second.mark_available();
simple_wml::document udiff;
if (make_change_diff(games_and_users_list_.root(), NULL,
"user", pl->second.config_address(), diff)) {
send_diff = true;
"user", pl->second.config_address(), udiff)) {
lobby_.send_data(udiff);
}
} else {
ERR_SERVER << "ERROR: delete_game(): Could not find user in players_. (socket: "
<< *user << ")\n";
}
}
if (send_diff) {
lobby_.send_data(diff,0,"lobby_delete_g");
}
//send users in the game a notification to leave the game since it has ended
static simple_wml::document leave_game_doc("[leave_game]\n[/leave_game]\n", simple_wml::INIT_COMPRESSED);