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

merged 2008-03-29T21:27:21Z!davewx7@gmail.com and 2008-03-29T21:54:22Z!davewx7@gmail.com from trunk...

Browse source 
...(made server sending diffs when a game exists more efficient)
This commit is contained in:
Martin Renold 2008-03-29 22:08:30 +00:00
parent 11732907dc
commit 60c517a84a
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/server/server.cpp
View file

@ -1472,9 +1472,18 @@ void server::process_data_game(const network::connection sock,
void server::delete_game(std::vector<game*>::iterator game_it) {
metrics_.game_terminated((*game_it)->termination_reason());
// Delete the game from the games_and_users_list_.
simple_wml::node* const gamelist = games_and_users_list_.child("gamelist");
assert(gamelist != NULL);
// Send a diff of the gamelist with the game deleted to players in the lobby
simple_wml::document diff;
if(make_delete_diff(*gamelist, "gamelist", "game",
(*game_it)->description(), diff)) {
lobby_.send_data(diff);
}
// Delete the game from the games_and_users_list_.
const simple_wml::node::child_list& games = gamelist->children("game");
const simple_wml::node::child_list::const_iterator g =
std::find(games.begin(), games.end(), (*game_it)->description());
@ -1505,11 +1514,11 @@ void server::delete_game(std::vector<game*>::iterator game_it) {
(*game_it)->send_data(leave_game_doc);
// Put the remaining users back in the lobby.
lobby_.add_players(**game_it, true);
(*game_it)->send_data(games_and_users_list_);
delete *game_it;
games_.erase(game_it);
//refresh the lobby for everyone, including the players who were in the game
send_gamelist_diff();
}
void server::send_gamelist_diff(network::connection exclude)