From 4282a9d069b3bedc8888a4e6202f2b066233d4ec Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Thu, 25 Nov 2010 03:01:43 +0100 Subject: Rename Player to Client, to better reflect what it represents. A Player should be specific to a game, while a Client may participate in several. --- server/game.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server/game.h') diff --git a/server/game.h b/server/game.h index f0f1564..2574dc3 100644 --- a/server/game.h +++ b/server/game.h @@ -7,7 +7,7 @@ #include #include "wall.h" -#include "player.h" +#include "client.h" #include "../common/action.h" #include "gamevariant.h" @@ -17,16 +17,16 @@ class Game : public boost::enable_shared_from_this { public: typedef boost::shared_ptr p; - static p create(Player::p player_1, Player::p player_2, Player::p player_3, Player::p player_4); + static p create(Client::p player_1, Client::p player_2, Client::p player_3, Client::p player_4); ~Game(); private: - std::vector players; + std::vector players; int waiting_players; - Game(Player::p player_1, Player::p player_2, Player::p player_3, Player::p player_4); + Game(Client::p player_1, Client::p player_2, Client::p player_3, Client::p player_4); GameVariant *ruleset; -- cgit v1.2.3