diff options
author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-11-25 03:01:43 +0100 |
---|---|---|
committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-11-25 03:01:43 +0100 |
commit | 4282a9d069b3bedc8888a4e6202f2b066233d4ec (patch) | |
tree | 8e0646804a7b33883be5867833e7b02004ddca1c /server/game.h | |
parent | d5aae396856ee801eb2e2420b786fda2f13cf391 (diff) |
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.
Diffstat (limited to 'server/game.h')
-rw-r--r-- | server/game.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 <vector> #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<Game> { public: typedef boost::shared_ptr<Game> 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<Player::p> players; + std::vector<Client::p> 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; |