Use PlayerState and GameState in Message::RoundState.

1 files changed, 10 insertions, 4 deletions

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;
 }