1 files changed, 20 insertions, 5 deletions
diff --git a/common/message.h b/common/message.h
index cb709af..6f48742 100644
--- a/common/message.h
+++ b/common/message.h
@@ -13,7 +13,7 @@ using boost::dynamic_pointer_cast;
 #include <vector>
 #include <string>
 
-#include "state.h"
+#include "action.h"
 #include "tile.h"
 
 namespace Message {
@@ -139,12 +139,27 @@ namespace Message {
 		public:
 			typedef boost::shared_ptr<RoundState> p;
 			
+			// Player contents.
+			struct Player {
+				//! Concealed tiles in hand.
+				Tiles hand;
+				//! Open tiles in hand.
+				Tiles open;
+				//! Discarded tiles.
+				Tiles pond;
+				
+				template<class Archive>
+				void serialize(Archive & ar, const unsigned int version) {
+					ar & hand;
+					ar & open;
+					ar & pond;
+				}
+			};
+			
 			RoundState();
-			RoundState(State state);
+			RoundState(const Player& pl_d, const Player& pl_r, const Player& pl_u, const Player& pl_l, const Tiles& d, const Actions& a);
 			
-			Tiles hand[4];
-			Tiles open[4];
-			Tiles pond[4];
+			Player players[4];
 			
 			Tiles dora;