diff options
| author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-11-29 00:25:58 +0100 |
|---|---|---|
| committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-11-29 00:26:36 +0100 |
| commit | 3111e83d416d0bbba278759ae095040c7994f949 (patch) | |
| tree | 46174537f12e00abd0d1e1e565b4636db9bb827d /server/game.cpp | |
| parent | 3a9d89c2abf1fb2eb2cc465a91f2cd3a1ea0750d (diff) | |
Wait for Ready from client before starting a new round.
Diffstat (limited to 'server/game.cpp')
| -rw-r--r-- | server/game.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/server/game.cpp b/server/game.cpp index 407df34..f4d5dec 100644 --- a/server/game.cpp +++ b/server/game.cpp @@ -297,10 +297,12 @@ void Game::handle_action_discard(Action action, int player) { } void Game::round_end() { - players[0].client->round_end(); - players[1].client->round_end(); - players[2].client->round_end(); - players[3].client->round_end(); + awaiting_players = 4; + + players[0].client->round_end(boost::bind(&Game::handle_ready, shared_from_this())); + players[1].client->round_end(boost::bind(&Game::handle_ready, shared_from_this())); + players[2].client->round_end(boost::bind(&Game::handle_ready, shared_from_this())); + players[3].client->round_end(boost::bind(&Game::handle_ready, shared_from_this())); // Flere runder? round_start() // Ferdig? game_end() |