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/client.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'server/client.h') diff --git a/server/client.h b/server/client.h index add78f0..3455056 100644 --- a/server/client.h +++ b/server/client.h @@ -25,10 +25,8 @@ class ClientBase { //! Notify client of a round start. virtual void round_start() = 0; - typedef Message::RoundState::Player PlayerState; - //! Send round state. - virtual void round_state(const PlayerState& pl_d, const PlayerState& pl_r, const PlayerState& pl_u, const PlayerState& pl_l, const Tiles& d, const Actions& a, int p) = 0; + virtual void round_state(const PlayerState& pl_d, const PlayerState& pl_r, const PlayerState& pl_u, const PlayerState& pl_l, const GameState& g, const Actions& a) = 0; //! Send round end. virtual void round_end(boost::function callback) = 0; @@ -83,7 +81,7 @@ class Client : public ClientBase, public boost::enable_shared_from_this virtual void round_start(); //! Send round state. - virtual void round_state(const PlayerState& pl_d, const PlayerState& pl_r, const PlayerState& pl_u, const PlayerState& pl_l, const Tiles& d, const Actions& a, int p); + virtual void round_state(const PlayerState& pl_d, const PlayerState& pl_r, const PlayerState& pl_u, const PlayerState& pl_l, const GameState& g, const Actions& a); //! Send round end. virtual void round_end(boost::function callback); @@ -102,7 +100,7 @@ class ClientDumb : public ClientBase { virtual void round_start(); - virtual void round_state(const PlayerState& pl_d, const PlayerState& pl_r, const PlayerState& pl_u, const PlayerState& pl_l, const Tiles& d, const Actions& a, int p); + virtual void round_state(const PlayerState& pl_d, const PlayerState& pl_r, const PlayerState& pl_u, const PlayerState& pl_l, const GameState& g, const Actions& a); virtual void round_end(boost::function callback); -- cgit v1.2.3