From dd5a8a6e38a30d1d638c33ffcd90841a67511000 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Fri, 28 Apr 2017 18:08:40 +1100 Subject: [PATCH] Menu Handler: made state gamestate/gameboard data getters public This is to enable the MP Change Control dialog to use them. --- src/menu_events.hpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/menu_events.hpp b/src/menu_events.hpp index d3d2876af091..0ecdfd5f401e 100644 --- a/src/menu_events.hpp +++ b/src/menu_events.hpp @@ -103,6 +103,14 @@ class menu_handler : private chat_handler { void do_command(const std::string &str); void do_ai_formula(const std::string &str, int side_num, mouse_handler &mousehandler); void send_to_server(const config& cfg) override; + + game_state & gamestate() const; + game_data & gamedata(); + game_board & board() const; + unit_map& units(); + std::vector& teams() const; + const gamemap& map() const; + protected: void add_chat_message(const time_t& time, const std::string& speaker, int side, const std::string& message, @@ -120,13 +128,6 @@ class menu_handler : private chat_handler { game_display* gui_; play_controller & pc_; - game_state & gamestate() const; - game_data & gamedata(); - game_board & board() const; - unit_map& units(); - std::vector& teams() const; - const gamemap& map() const; - const config& game_config_; gui::floating_textbox textbox_info_;