Use PlayerState and GameState in Message::RoundState.

1 files changed, 3 insertions, 4 deletions

diff --git a/server/game.h b/server/game.h
index 1de6c73..b0ec4a2 100644
--- a/server/game.h
+++ b/server/game.h
@@ -9,6 +9,7 @@
 #include "wall.h"
 #include "client.h"
 #include "../common/action.h"
+#include "../common/state.h"
 #include "../common/cyclicint.h"
 
 class Game : public boost::enable_shared_from_this<Game> {
@@ -34,13 +35,11 @@ class Game : public boost::enable_shared_from_this<Game> {
 				//! Prepare for a new round.
 				void round_start();
 				
-				typedef Client::PlayerState State;
-				
 				//! Get a state snapshot.
-				State get_state();
+				PlayerState get_state();
 				
 				//! Get a state snapshot, with concealed tiles filtered.
-				State get_state_filtered();
+				PlayerState get_state_filtered();
 				
 				//! Get possible actions after a draw.
 				Actions get_actions_draw();