From 55f8b1431ab0cd92f61613f85e38d54f628eda3d Mon Sep 17 00:00:00 2001 From: Gunter Labes Date: Wed, 25 Mar 2009 18:19:26 +0000 Subject: [PATCH] added a todo + some tweaks --- src/server/game.cpp | 2 ++ src/server/server.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/game.cpp b/src/server/game.cpp index 968aa8978f9..010cfa02d88 100644 --- a/src/server/game.cpp +++ b/src/server/game.cpp @@ -876,6 +876,8 @@ bool game::end_turn() { return true; } +//@todo differentiate between "observers not allowed" and "player already in the game" errors. +// maybe return a string with an error message. bool game::add_player(const network::connection player, bool observer, bool admin) { if(is_member(player)) { ERR_GAME << "ERROR: Player is already in this game. (socket: " diff --git a/src/server/server.cpp b/src/server/server.cpp index 08b6166fe3e..eac911d689a 100644 --- a/src/server/server.cpp +++ b/src/server/server.cpp @@ -1892,7 +1892,8 @@ void server::process_data_lobby(const network::connection sock, } LOG_SERVER << network::ip_address(sock) << "\t" << pl->second.name() << "\tjoined game:\t\"" << (*g)->name() - << "\" (" << game_id << (observer ? ") as an observer.\n" : ").\n"); + << "\" (" << game_id << ")" << (observer ? " as an observer" : "") + << ". (socket: " << sock << ")\n"; lobby_.remove_player(sock); (*g)->describe_slots(); @@ -1934,11 +1935,8 @@ void server::process_data_game(const network::connection sock, return; } - std::vector::iterator itor; - for (itor = games_.begin(); itor != games_.end(); ++itor) { - if ((*itor)->is_owner(sock) || (*itor)->is_member(sock)) - break; - } + const std::vector::iterator itor = + std::find_if(games_.begin(),games_.end(), wesnothd::game_is_member(sock)); if (itor == games_.end()) { ERR_SERVER << "ERROR: Could not find game for player: " << pl->second.name() << ". (socket: " << sock << ")\n";