Skip to content

Commit

Permalink
Cleaned up game_board.hpp and some related includes
Browse files Browse the repository at this point in the history
Includes a minor cleanup of the Game Stats dialog to not use a game_board reference.
Dunno why I was taking a game_board reference in the show() function anyway... the
class held a display_context reference and didn't use any functions exclusive to
game_board.
  • Loading branch information
Vultraz committed Apr 20, 2018
1 parent e05b136 commit d6718cd
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/ai/formula/candidates.cpp
Expand Up @@ -19,8 +19,8 @@

#include "ai/formula/ai.hpp"
#include "ai/formula/candidates.hpp"
#include "game_board.hpp"
#include "log.hpp"
#include "team.hpp"
#include "units/unit.hpp"

static lg::log_domain log_formula_ai("ai/engine/fai");
Expand Down
1 change: 0 additions & 1 deletion src/editor/controller/editor_controller.cpp
Expand Up @@ -42,7 +42,6 @@
#include "cursor.hpp"
#include "desktop/clipboard.hpp"
#include "floating_label.hpp"
#include "game_board.hpp"
#include "help/help.hpp"
#include "preferences/game.hpp"
#include "gettext.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/editor/map/context_manager.cpp
Expand Up @@ -21,7 +21,6 @@
#include "editor/map/map_context.hpp"
#include "filesystem.hpp"
#include "formula/string_utils.hpp"
#include "game_board.hpp"
#include "generators/map_create.hpp"
#include "generators/map_generator.hpp"
#include "gettext.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/editor/map/map_context.cpp
Expand Up @@ -19,7 +19,6 @@
#include "editor/action/action.hpp"
#include "filesystem.hpp"
#include "formula/string_utils.hpp"
#include "game_board.hpp"
#include "gettext.hpp"
#include "map/exception.hpp"
#include "map/label.hpp"
Expand Down
2 changes: 0 additions & 2 deletions src/gui/dialogs/game_stats.cpp
Expand Up @@ -30,9 +30,7 @@
#include "gui/widgets/stacked_widget.hpp"
#include "gui/widgets/toggle_button.hpp"
#include "gui/widgets/window.hpp"
#include "display.hpp"
#include "formatter.hpp"
#include "game_board.hpp"
#include "game_classification.hpp"
#include "map/map.hpp"
#include "play_controller.hpp"
Expand Down
7 changes: 3 additions & 4 deletions src/gui/dialogs/game_stats.hpp
Expand Up @@ -13,7 +13,7 @@

#pragma once

#include "game_board.hpp"
#include "display_context.hpp"
#include "gettext.hpp"
#include "gui/dialogs/modal_dialog.hpp"
#include "gui/dialogs/transient_message.hpp"
Expand All @@ -23,7 +23,6 @@
#include <string>
#include <vector>

class display;
class team;
struct team_data;

Expand All @@ -37,9 +36,9 @@ class game_stats : public modal_dialog
public:
game_stats(const display_context& board, const int viewing_team, int& selected_index);

static bool execute(game_board& board, const int viewing_team, int& selected_index)
static bool execute(const display_context& board, const int viewing_team, int& selected_index)
{
if(std::all_of(board.teams().begin(), board.teams().end(), [](team& team) { return team.hidden(); })) {
if(std::all_of(board.teams().begin(), board.teams().end(), [](const team& team) { return team.hidden(); })) {
show_transient_message("", _("No visible sides found."));
return false;
}
Expand Down
1 change: 0 additions & 1 deletion src/gui/dialogs/gamestate_inspector.cpp
Expand Up @@ -31,7 +31,6 @@
#include "game_events/manager.hpp"
#include "serialization/parser.hpp" // for write()

#include "game_board.hpp"
#include "game_data.hpp"
#include "recall_list_manager.hpp"
#include "team.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/mouse_events.cpp
Expand Up @@ -20,7 +20,6 @@
#include "actions/undo.hpp" // for undo_list
#include "config.hpp" // for config
#include "cursor.hpp" // for set, CURSOR_TYPE::NORMAL, etc
#include "game_board.hpp" // for game_board, etc
#include "game_events/pump.hpp" // for fire
#include "gettext.hpp" // for _
#include "gui/dialogs/transient_message.hpp" // for show_transient_message
Expand Down
1 change: 0 additions & 1 deletion src/movetype.cpp
Expand Up @@ -19,7 +19,6 @@

#include "movetype.hpp"

#include "game_board.hpp"
#include "game_config_manager.hpp"
#include "log.hpp"
#include "map/map.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/terrain/filter.cpp
Expand Up @@ -17,7 +17,6 @@
#include "config.hpp"
#include "display_context.hpp"
#include "filter_context.hpp"
#include "game_board.hpp"
#include "game_data.hpp"
#include "log.hpp"
#include "map/map.hpp"
Expand Down
1 change: 0 additions & 1 deletion src/units/abilities.cpp
Expand Up @@ -26,7 +26,6 @@
#include "formula/callable_objects.hpp"
#include "formula/formula.hpp"
#include "formula/function_gamestate.hpp"
#include "game_board.hpp"
#include "lexical_cast.hpp"
#include "log.hpp"
#include "resources.hpp"
Expand Down

0 comments on commit d6718cd

Please sign in to comment.