Moved lots of code in Game out into a separate class.

Signed-off-by: Atle Hellvik Havsø <atle@havso.net>

1 files changed, 4 insertions, 17 deletions

diff --git a/server/game.h b/server/game.h
index f88ffd4..f0f1564 100644
--- a/server/game.h
+++ b/server/game.h
@@ -10,6 +10,9 @@
 #include "player.h"
 #include "../common/action.h"
 
+#include "gamevariant.h"
+#include "standard.h"
+
 class Game : public boost::enable_shared_from_this<Game> {
 	public:
 		typedef boost::shared_ptr<Game> p;
@@ -25,23 +28,7 @@ class Game : public boost::enable_shared_from_this<Game> {
 		
 		Game(Player::p player_1, Player::p player_2, Player::p player_3, Player::p player_4);
 		
-		//! The wall that belongs to this game
-		Wall wall;
-		
-		//! The current state of the game
-		State game_state;
-		
-		//! Current player, used when discarding etc
-		int current_player;
-		
-		//! Are we in draw or discard phase?
-		bool draw_phase; 
-		
-		//! Number of players doing action
-		int num_player_actions;
-		
-		//! Highest value action done
-		Action most_value_action;
+		GameVariant *ruleset;
 		
 		//! Handle Ready message from player.
 		void handle_ready();