summaryrefslogtreecommitdiff
path: root/common/message.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'common/message.cpp')
-rw-r--r--common/message.cpp22
1 files changed, 8 insertions, 14 deletions
diff --git a/common/message.cpp b/common/message.cpp
index 08c2cdd..4552f2e 100644
--- a/common/message.cpp
+++ b/common/message.cpp
@@ -136,28 +136,22 @@ Message::RoundState::RoundState() : BoostBase(Types::RoundState) {
}
-Message::RoundState::RoundState(State state) : BoostBase(Types::RoundState) {
- // Compatibility constructor. To be removed.
- for(std::size_t i = 0; i < 4; i++) {
- hand[i] = state.players[i].hand;
- open[i] = state.players[i].open;
- pond[i] = state.players[i].pond;
- possible_actions = state.possible_actions;
- }
+Message::RoundState::RoundState(const Player& pl_d, const Player& pl_r, const Player& pl_u, const Player& pl_l, const Tiles& d, const Actions& a)
+ : BoostBase(Types::RoundState), dora(d), possible_actions(a) {
+ players[0] = pl_d;
+ players[1] = pl_d;
+ players[2] = pl_d;
+ players[3] = pl_d;
}
void Message::RoundState::serialize(boost::archive::text_oarchive& ar) {
- ar & hand;
- ar & open;
- ar & pond;
+ ar & players;
ar & dora;
ar & possible_actions;
}
void Message::RoundState::deserialize(boost::archive::text_iarchive& ar) {
- ar & hand;
- ar & open;
- ar & pond;
+ ar & players;
ar & dora;
ar & possible_actions;
}