diff options
Diffstat (limited to 'server/game.cpp')
| -rw-r--r-- | server/game.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/server/game.cpp b/server/game.cpp index 628a966..b0739cb 100644 --- a/server/game.cpp +++ b/server/game.cpp @@ -116,7 +116,7 @@ void Game::round_update_draw() { // Construct and send state to each client. PlayerNum player = 0; do { - Player::State state[4]; + PlayerState state[4]; state[0] = players[player].get_state(); state[1] = players[player + 1].get_state_filtered(); @@ -128,7 +128,11 @@ void Game::round_update_draw() { a = possible_actions; } - players[player].client->round_state(state[0], state[1], state[2], state[3], dora, a, current_player - player); + GameState gstate; + gstate.dora = dora; + gstate.current_player = current_player - player; + + players[player].client->round_state(state[0], state[1], state[2], state[3], gstate, a); } while(++player); // Await action from client. @@ -143,7 +147,7 @@ void Game::round_update_discard() { // Construct and send state to each client. PlayerNum player = 0; do { - Player::State state[4]; + PlayerState state[4]; state[0] = players[player].get_state(); state[1] = players[player + 1].get_state_filtered(); @@ -157,7 +161,11 @@ void Game::round_update_discard() { } } - players[player].client->round_state(state[0], state[1], state[2], state[3], dora, a, current_player - player); + GameState gstate; + gstate.dora = dora; + gstate.current_player = current_player - player; + + players[player].client->round_state(state[0], state[1], state[2], state[3], gstate, a); } while(++player); preceding_action = Action::Pass; |