diff options
| -rw-r--r-- | server/game.cpp | 4 | ||||
| -rw-r--r-- | server/game.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/server/game.cpp b/server/game.cpp index f4d5dec..1de99ad 100644 --- a/server/game.cpp +++ b/server/game.cpp @@ -10,7 +10,7 @@ #include <ctime> #endif -Game::p Game::create(Client::p player_1, Client::p player_2, Client::p player_3, Client::p player_4) { +Game::p Game::create(ClientBase::p player_1, ClientBase::p player_2, ClientBase::p player_3, ClientBase::p player_4) { Game::p p(new Game(player_1, player_2, player_3, player_4)); p->start(); return p; @@ -20,7 +20,7 @@ Game::~Game() { std::cout << "Game destroyed." << std::endl; } -Game::Game(Client::p player_1, Client::p player_2, Client::p player_3, Client::p player_4) { +Game::Game(ClientBase::p player_1, ClientBase::p player_2, ClientBase::p player_3, ClientBase::p player_4) { players[0].client = player_1; players[1].client = player_2; players[2].client = player_3; 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<Game> { public: typedef boost::shared_ptr<Game> 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<Game> { 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<Game> { 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(); |