From d8f9d6c3baaaf6bd1b6615bd38201c5bcf2fee57 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Wed, 1 Dec 2010 14:06:24 +0100 Subject: Made Game and Game::Player take ChildBase::p instead of Child::p. --- server/game.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'server/game.h') diff --git a/server/game.h b/server/game.h index 8bf89e8..6c986f5 100644 --- a/server/game.h +++ b/server/game.h @@ -15,7 +15,7 @@ class Game : public boost::enable_shared_from_this { public: typedef boost::shared_ptr p; - static p create(Client::p player_1, Client::p player_2, Client::p player_3, Client::p player_4); + static p create(ClientBase::p player_1, ClientBase::p player_2, ClientBase::p player_3, ClientBase::p player_4); ~Game(); @@ -24,7 +24,7 @@ class Game : public boost::enable_shared_from_this { class Player { public: - Client::p client; + ClientBase::p client; Tiles hand; Tilegroups open; @@ -105,7 +105,7 @@ class Game : public boost::enable_shared_from_this { Action preceding_action; int preceding_action_owner; - Game(Client::p player_1, Client::p player_2, Client::p player_3, Client::p player_4); + Game(ClientBase::p player_1, ClientBase::p player_2, ClientBase::p player_3, ClientBase::p player_4); //! Handle Ready message from player. void handle_ready(); -- cgit v1.2.3