From b3e77a656f8556b855ec17e89679c4dd4a4d9ad3 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sun, 3 Jan 2021 21:40:10 +1100 Subject: [PATCH] Menu Events: avoid resource pointers where possible --- src/menu_events.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/menu_events.cpp b/src/menu_events.cpp index 75b2053ccb6e..423b473ea270 100644 --- a/src/menu_events.cpp +++ b/src/menu_events.cpp @@ -1471,7 +1471,7 @@ void console_handler::do_droid() std::transform(action.begin(), action.end(), action.begin(), tolower); // default to the current side if empty const unsigned int side = side_s.empty() ? team_num_ : lexical_cast_default(side_s); - const bool is_your_turn = resources::controller->current_side() == static_cast(display::get_singleton()->viewing_side()); + const bool is_your_turn = menu_handler_.pc_.current_side() == static_cast(display::get_singleton()->viewing_side()); utils::string_map symbols; symbols["side"] = std::to_string(side); @@ -1670,9 +1670,10 @@ void console_handler::do_control() try { side_num = lexical_cast(side); } catch(const bad_lexical_cast&) { - const auto it_t = std::find_if( - resources::gameboard->teams().begin(), resources::gameboard->teams().end(), save_id_matches(side)); - if(it_t == resources::gameboard->teams().end()) { + const auto& teams = menu_handler_.pc_.get_teams(); + const auto it_t = std::find_if(teams.begin(), teams.end(), save_id_matches(side)); + + if(it_t == teams.end()) { utils::string_map symbols; symbols["side"] = side; command_failed(VGETTEXT("Can't change control of invalid side: '$side'.", symbols)); @@ -1964,7 +1965,7 @@ void console_handler::do_inspect() { vconfig cfg = vconfig::empty_vconfig(); gui2::dialogs::gamestate_inspector::display( - resources::gamedata->get_variables(), *resources::game_events, *resources::gameboard); + menu_handler_.gamedata().get_variables(), *resources::game_events, menu_handler_.board()); } void console_handler::do_control_dialog()