From 358531e06c7dee6fe1ff5b34a416b27d4c16d6c4 Mon Sep 17 00:00:00 2001
From: Chris Beck <render787@gmail.com>
Date: Sun, 8 Jun 2014 19:00:54 -0400
Subject: [PATCH] menu handler uses game_board in it's constructor

---
 src/game_board.hpp      |  2 ++
 src/menu_events.cpp     | 11 ++++++-----
 src/menu_events.hpp     |  5 +++--
 src/play_controller.cpp |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/game_board.hpp b/src/game_board.hpp
index e96c1878b990..7e40ef7a4678 100644
--- a/src/game_board.hpp
+++ b/src/game_board.hpp
@@ -28,6 +28,7 @@ class config;
 
 namespace events {
 	class mouse_handler;
+	class menu_handler;
 }
 
 /**
@@ -58,6 +59,7 @@ class game_board {
 	friend class playsingle_controller;
 	friend class playmp_controller;
 	friend class events::mouse_handler;
+	friend class events::menu_handler;
 
 	friend class game_display;
 	/** 
diff --git a/src/menu_events.cpp b/src/menu_events.cpp
index cc73cf99b29b..2dccf33f7469 100644
--- a/src/menu_events.cpp
+++ b/src/menu_events.cpp
@@ -30,6 +30,7 @@
 #include "dialogs.hpp"
 #include "formatter.hpp"
 #include "filechooser.hpp"
+#include "game_board.hpp"
 #include "game_end_exceptions.hpp"
 #include "game_events/pump.hpp"
 #include "game_preferences.hpp"
@@ -80,14 +81,14 @@ static lg::log_domain log_engine("engine");
 
 namespace events{
 
-menu_handler::menu_handler(game_display* gui, unit_map& units, std::vector<team>& teams,
-		const config& level, const gamemap& map,
+menu_handler::menu_handler(game_display* gui, game_board & board,
+		const config& level,
 		const config& game_config, game_state& gamestate) :
 	gui_(gui),
-	units_(units),
-	teams_(teams),
+	units_(board.units_),
+	teams_(board.teams_),
 	level_(level),
-	map_(map),
+	map_(board.map()),
 	game_config_(game_config),
 	gamestate_(gamestate),
 	textbox_info_(),
diff --git a/src/menu_events.hpp b/src/menu_events.hpp
index f4b5e7266106..c9d4b28ef5a4 100644
--- a/src/menu_events.hpp
+++ b/src/menu_events.hpp
@@ -21,6 +21,7 @@
 #include "floating_textbox.hpp"
 #include "unit_map.hpp"
 
+class game_board;
 class game_state;
 class gamemap;
 
@@ -34,8 +35,8 @@ namespace events {
 
 class menu_handler : private chat_handler {
 public:
-	menu_handler(game_display* gui, unit_map& units, std::vector<team>& teams,
-		const config& level, const gamemap& map,
+	menu_handler(game_display* gui, game_board & board,
+		const config& level,
 		const config& game_config, game_state& gamestate);
 	virtual ~menu_handler();
 
diff --git a/src/play_controller.cpp b/src/play_controller.cpp
index 248e082bcac7..f4cbc2847194 100644
--- a/src/play_controller.cpp
+++ b/src/play_controller.cpp
@@ -108,7 +108,7 @@ play_controller::play_controller(const config& level, game_state& state_of_game,
 	labels_manager_(),
 	help_manager_(&game_config),
 	mouse_handler_(NULL, gameboard_),
-	menu_handler_(NULL, gameboard_.units_, gameboard_.teams_, level, gameboard_.map_, game_config, state_of_game),
+	menu_handler_(NULL, gameboard_, level, game_config, state_of_game),
 	soundsources_manager_(),
 	tod_manager_(level),
 	pathfind_manager_(),