From 34e376a4908f8f2235d28314c4f779bbd1d09389 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Fri, 3 Dec 2010 10:33:05 +0100 Subject: Use PlayerState and GameState in Message::RoundState. --- server/player.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'server/player.cpp') diff --git a/server/player.cpp b/server/player.cpp index 554084d..6673937 100644 --- a/server/player.cpp +++ b/server/player.cpp @@ -13,13 +13,19 @@ void Game::Player::round_start() { client->round_start(); } -Game::Player::State Game::Player::get_state() { - State state = {hand, open, pond}; +PlayerState Game::Player::get_state() { + Tilegroups h = open; + h.insert(h.begin(), hand); + + PlayerState state = {h, pond}; return state; } -Game::Player::State Game::Player::get_state_filtered() { - State state = {hand, open, pond}; +PlayerState Game::Player::get_state_filtered() { + Tilegroups h = open; + h.insert(h.begin(), hand); + + PlayerState state = {h, pond}; return state; } -- cgit v1.2.3