From a265fcaf73543d028b44a10fbbca2b18979f3845 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Thu, 25 Nov 2010 01:33:42 +0100 Subject: Check for valid action. --- server/player.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'server/player.cpp') diff --git a/server/player.cpp b/server/player.cpp index b1d8467..d8baaf8 100644 --- a/server/player.cpp +++ b/server/player.cpp @@ -49,16 +49,18 @@ void Player::handle_ready(Message::p msg, boost::function ready_callbac ready_callback(); } -void Player::handle_action(Message::p msg, boost::function action_callback) { +void Player::handle_action(Message::p msg, boost::function action_callback, Actions possible_actions) { if(msg->type != Message::Types::RoundAction) { return; } Message::RoundAction::p action_msg = dynamic_pointer_cast(msg); - //action_msg->action.player = id; - if(action_callback != 0) { + // Check if the action is valid. + if(possible_actions.contains(action_msg->action)) { action_callback(action_msg->action); + } else { + action_callback(possible_actions[0]); } } @@ -91,8 +93,8 @@ void Player::round_end() { connection->send(make_shared()); } -void Player::get_action(boost::function callback) { - connection->recv(boost::bind(&Player::handle_action, shared_from_this(), _1, callback)); +void Player::get_action(boost::function callback, Actions expected_actions) { + connection->recv(boost::bind(&Player::handle_action, shared_from_this(), _1, callback, expected_actions)); } void Player::kill_action() { -- cgit v1.2.3