From 63c07fea3e895a0791c95f954ac9686870f98878 Mon Sep 17 00:00:00 2001 From: gfgtdf Date: Mon, 16 Jun 2014 23:52:46 +0200 Subject: [PATCH] move game_classification to its own file --- src/CMakeLists.txt | 1 + src/SConscript | 1 + src/ai/composite/goal.cpp | 1 - src/ai/default/ai.cpp | 2 +- src/ai/lua/core.cpp | 1 - src/ai/testing/ca.cpp | 1 + src/ai/testing/ca_testing_recruitment.cpp | 1 - src/editor/map/map_context.hpp | 3 +- src/game_classification.cpp | 101 ++++++++++++++++++++++ src/game_classification.hpp | 61 +++++++++++++ src/game_config_manager.cpp | 1 + src/game_config_manager.hpp | 2 +- src/game_events/action_wml.cpp | 1 + src/game_preferences.cpp | 1 - src/gamestatus.cpp | 73 ---------------- src/gamestatus.hpp | 49 +---------- src/gui/dialogs/chat_log.cpp | 1 - src/gui/dialogs/game_load.cpp | 2 +- src/multiplayer_connect.hpp | 1 - src/multiplayer_ui.cpp | 1 - src/multiplayer_wait.hpp | 1 - src/replay_controller.hpp | 1 - src/save_index.cpp | 1 - src/save_index.hpp | 4 - src/saved_game.cpp | 1 - src/saved_game.hpp | 3 +- src/savegame.hpp | 1 - src/scripting/lua.cpp | 2 + src/synced_context.cpp | 1 + src/unit_abilities.cpp | 1 - 30 files changed, 178 insertions(+), 143 deletions(-) create mode 100644 src/game_classification.cpp create mode 100644 src/game_classification.hpp diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fe97db1952c4..127f88b3609d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -740,6 +740,7 @@ set(wesnoth-main_SRC formula_string_utils.cpp formula_tokenizer.cpp game_board.cpp + game_classification.cpp game_config_manager.cpp game_controller.cpp game_display.cpp diff --git a/src/SConscript b/src/SConscript index fcb8dd32aa8b..a0b8110fd66f 100644 --- a/src/SConscript +++ b/src/SConscript @@ -273,6 +273,7 @@ wesnoth_sources = Split(""" formula_string_utils.cpp formula_tokenizer.cpp game_board.cpp + game_classification.cpp game_config_manager.cpp game_controller.cpp game_display.cpp diff --git a/src/ai/composite/goal.cpp b/src/ai/composite/goal.cpp index b7810b103ef5..72623db260c4 100644 --- a/src/ai/composite/goal.cpp +++ b/src/ai/composite/goal.cpp @@ -23,7 +23,6 @@ #include "../manager.hpp" #include "../../log.hpp" #include "../lua/lua_object.hpp" -#include "../../gamestatus.hpp" #include "../../resources.hpp" #include "../../scripting/lua.hpp" #include "../../terrain_filter.hpp" diff --git a/src/ai/default/ai.cpp b/src/ai/default/ai.cpp index a6d21a2815cd..5aca648d2a53 100644 --- a/src/ai/default/ai.cpp +++ b/src/ai/default/ai.cpp @@ -27,7 +27,7 @@ #include "../../dialogs.hpp" #include "../../game_board.hpp" #include "../../game_events/pump.hpp" -#include "../../gamestatus.hpp" +#include "../../game_classification.hpp" #include "../../log.hpp" #include "../../mouse_handler_base.hpp" #include "../../resources.hpp" diff --git a/src/ai/lua/core.cpp b/src/ai/lua/core.cpp index ec4262a63624..fa95d5801a06 100644 --- a/src/ai/lua/core.cpp +++ b/src/ai/lua/core.cpp @@ -33,7 +33,6 @@ #include "../../attack_prediction.hpp" #include "../../filesystem.hpp" #include "../../game_display.hpp" -#include "../../gamestatus.hpp" #include "../../log.hpp" #include "../../map.hpp" #include "../../pathfind/pathfind.hpp" diff --git a/src/ai/testing/ca.cpp b/src/ai/testing/ca.cpp index 6fb512f9208a..53d6281d2ca7 100644 --- a/src/ai/testing/ca.cpp +++ b/src/ai/testing/ca.cpp @@ -24,6 +24,7 @@ #include "../composite/rca.hpp" #include "../composite/stage.hpp" #include "../../game_board.hpp" +#include "../../game_classification.hpp" #include "../../gamestatus.hpp" #include "../../log.hpp" #include "../../map.hpp" diff --git a/src/ai/testing/ca_testing_recruitment.cpp b/src/ai/testing/ca_testing_recruitment.cpp index 0c03984621ad..43a3400321aa 100644 --- a/src/ai/testing/ca_testing_recruitment.cpp +++ b/src/ai/testing/ca_testing_recruitment.cpp @@ -24,7 +24,6 @@ #include "../composite/rca.hpp" #include "../composite/stage.hpp" #include "../../game_board.hpp" -#include "../../gamestatus.hpp" #include "../../log.hpp" #include "../../map.hpp" #include "../../resources.hpp" diff --git a/src/editor/map/map_context.hpp b/src/editor/map/map_context.hpp index a439b162eb03..a2b1fd7986ca 100644 --- a/src/editor/map/map_context.hpp +++ b/src/editor/map/map_context.hpp @@ -16,8 +16,9 @@ #define EDITOR_MAP_CONTEXT_HPP_INCLUDED #include "editor_map.hpp" -#include "gamestatus.hpp" +#include "game_classification.hpp" #include "map_label.hpp" +#include "mp_game_settings.hpp" #include "sound_music_track.hpp" #include "tod_manager.hpp" #include "unit_map.hpp" diff --git a/src/game_classification.cpp b/src/game_classification.cpp new file mode 100644 index 000000000000..b0fa9befe548 --- /dev/null +++ b/src/game_classification.cpp @@ -0,0 +1,101 @@ +/* + Copyright (C) 2003 - 2014 by David White + Part of the Battle for Wesnoth Project http://www.wesnoth.org/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY. + + See the COPYING file for more details. +*/ + +#include "global.hpp" +#include "game_classification.hpp" +#include "util.hpp" +#include "serialization/string_utils.hpp" +#include "log.hpp" + +static lg::log_domain log_engine("engine"); +#define ERR_NG LOG_STREAM(err, log_engine) +#define WRN_NG LOG_STREAM(warn, log_engine) +#define LOG_NG LOG_STREAM(info, log_engine) +#define DBG_NG LOG_STREAM(debug, log_engine) + +/// The default difficulty setting for campaigns. +const std::string DEFAULT_DIFFICULTY("NORMAL"); + +game_classification::game_classification(): + savegame_config(), + label(), + version(), + campaign_type(), + campaign_define(), + campaign_xtra_defines(), + campaign(), + abbrev(), + completion(), + end_credits(true), + end_text(), + end_text_duration(), + difficulty(DEFAULT_DIFFICULTY), + random_mode("") + {} + +game_classification::game_classification(const config& cfg): + savegame_config(), + label(cfg["label"]), + version(cfg["version"]), + campaign_type(lexical_cast_default (cfg["campaign_type"].str(), game_classification::SCENARIO)), + campaign_define(cfg["campaign_define"]), + campaign_xtra_defines(utils::split(cfg["campaign_extra_defines"])), + campaign(cfg["campaign"]), + abbrev(cfg["abbrev"]), + completion(cfg["completion"]), + end_credits(cfg["end_credits"].to_bool(true)), + end_text(cfg["end_text"]), + end_text_duration(cfg["end_text_duration"]), + difficulty(cfg["difficulty"].empty() ? DEFAULT_DIFFICULTY : cfg["difficulty"].str()), + random_mode(cfg["random_mode"]) + {} + +game_classification::game_classification(const game_classification& gc): + savegame_config(), + label(gc.label), + version(gc.version), + campaign_type(gc.campaign_type), + campaign_define(gc.campaign_define), + campaign_xtra_defines(gc.campaign_xtra_defines), + campaign(gc.campaign), + abbrev(gc.abbrev), + completion(gc.completion), + end_credits(gc.end_credits), + end_text(gc.end_text), + end_text_duration(gc.end_text_duration), + difficulty(gc.difficulty), + random_mode(gc.random_mode) +{ +} + +config game_classification::to_config() const +{ + config cfg; + + cfg["label"] = label; + cfg["version"] = game_config::version; + cfg["campaign_type"] = lexical_cast (campaign_type); + cfg["campaign_define"] = campaign_define; + cfg["campaign_extra_defines"] = utils::join(campaign_xtra_defines); + cfg["campaign"] = campaign; + cfg["abbrev"] = abbrev; + cfg["completion"] = completion; + cfg["end_credits"] = end_credits; + cfg["end_text"] = end_text; + cfg["end_text_duration"] = str_cast(end_text_duration); + cfg["difficulty"] = difficulty; + cfg["random_mode"] = random_mode; + + return cfg; +} diff --git a/src/game_classification.hpp b/src/game_classification.hpp new file mode 100644 index 000000000000..3dbb239beab2 --- /dev/null +++ b/src/game_classification.hpp @@ -0,0 +1,61 @@ +/* + Copyright (C) 2003 - 2014 by David White + Part of the Battle for Wesnoth Project http://www.wesnoth.org/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY. + + See the COPYING file for more details. +*/ + +#ifndef GAME_CLASSIFICATION_HPP_INCLUDED +#define GAME_CLASSIFICATION_HPP_INCLUDED + +#include "config.hpp" +#include "make_enum.hpp" +#include "savegame_config.hpp" + +/// The default difficulty setting for campaigns. +extern const std::string DEFAULT_DIFFICULTY; + +//meta information of the game +class game_classification : public savegame::savegame_config +{ +public: + game_classification(); + explicit game_classification(const config& cfg); + game_classification(const game_classification& gc); + + config to_config() const; + + std::string label; /**< Name of the game (e.g. name of save file). */ + std::string version; /**< Version game was created with. */ + MAKE_ENUM (CAMPAIGN_TYPE, /**< Type of the game - campaign, multiplayer etc. */ + (SCENARIO, "scenario") + (MULTIPLAYER, "multiplayer") + (TEST, "test") + (TUTORIAL, "tutorial") + ) + CAMPAIGN_TYPE campaign_type; + std::string campaign_define; /**< If there is a define the campaign uses to customize data */ + std::vector campaign_xtra_defines; /**< more customization of data */ + + std::string campaign; /**< the campaign being played */ + + std::string abbrev; /**< the campaign abbreviation */ +// std::string scenario; /**< the scenario being played */ +// std::string next_scenario; /**< the scenario coming next (for campaigns) */ + std::string completion; /**< running. victory, or defeat */ + bool end_credits; /**< whether to show the standard credits at the end */ + std::string end_text; /**< end-of-campaign text */ + unsigned int end_text_duration; /**< for how long the end-of-campaign text is shown */ + std::string difficulty; /**< The difficulty level the game is being played on. */ + std::string random_mode; +}; +MAKE_ENUM_STREAM_OPS2(game_classification, CAMPAIGN_TYPE) + +#endif diff --git a/src/game_config_manager.cpp b/src/game_config_manager.cpp index 38a9ac09d4cb..00c892ac4ad2 100644 --- a/src/game_config_manager.cpp +++ b/src/game_config_manager.cpp @@ -19,6 +19,7 @@ #include "cursor.hpp" #include "game_config.hpp" #include "gettext.hpp" +#include "game_classification.hpp" #include "gui/dialogs/wml_error.hpp" #include "hotkey/hotkey_item.hpp" #include "hotkey/hotkey_command.hpp" diff --git a/src/game_config_manager.hpp b/src/game_config_manager.hpp index a2667e5bb4dc..16eb5f5095ad 100644 --- a/src/game_config_manager.hpp +++ b/src/game_config_manager.hpp @@ -16,11 +16,11 @@ #include "commandline_options.hpp" #include "config_cache.hpp" -#include "gamestatus.hpp" #include "game_display.hpp" #include "filesystem.hpp" class config; +class game_classification; class game_config_manager { diff --git a/src/game_events/action_wml.cpp b/src/game_events/action_wml.cpp index 7613cafe97d2..b5a6209580b9 100644 --- a/src/game_events/action_wml.cpp +++ b/src/game_events/action_wml.cpp @@ -32,6 +32,7 @@ #include "../dialogs.hpp" #include "../fake_unit.hpp" #include "../fake_unit_manager.hpp" +#include "../game_classification.hpp" #include "../game_display.hpp" #include "../game_preferences.hpp" #include "../gettext.hpp" diff --git a/src/game_preferences.cpp b/src/game_preferences.cpp index 8e76c322e48b..44c2b759a4ba 100644 --- a/src/game_preferences.cpp +++ b/src/game_preferences.cpp @@ -19,7 +19,6 @@ #include "game_board.hpp" #include "game_display.hpp" #include "game_preferences.hpp" -#include "gamestatus.hpp" #include "gettext.hpp" #include "log.hpp" #include "map.hpp" diff --git a/src/gamestatus.cpp b/src/gamestatus.cpp index 9410e8796d89..d3d18cef0150 100644 --- a/src/gamestatus.cpp +++ b/src/gamestatus.cpp @@ -523,76 +523,3 @@ game_data* game_data::operator=(const game_data* info) } return this ; } - -game_classification::game_classification(): - savegame_config(), - label(), - version(), - campaign_type(), - campaign_define(), - campaign_xtra_defines(), - campaign(), - abbrev(), - completion(), - end_credits(true), - end_text(), - end_text_duration(), - difficulty(DEFAULT_DIFFICULTY), - random_mode("") - {} - -game_classification::game_classification(const config& cfg): - savegame_config(), - label(cfg["label"]), - version(cfg["version"]), - campaign_type(lexical_cast_default (cfg["campaign_type"].str(), game_classification::SCENARIO)), - campaign_define(cfg["campaign_define"]), - campaign_xtra_defines(utils::split(cfg["campaign_extra_defines"])), - campaign(cfg["campaign"]), - abbrev(cfg["abbrev"]), - completion(cfg["completion"]), - end_credits(cfg["end_credits"].to_bool(true)), - end_text(cfg["end_text"]), - end_text_duration(cfg["end_text_duration"]), - difficulty(cfg["difficulty"].empty() ? DEFAULT_DIFFICULTY : cfg["difficulty"].str()), - random_mode(cfg["random_mode"]) - {} - -game_classification::game_classification(const game_classification& gc): - savegame_config(), - label(gc.label), - version(gc.version), - campaign_type(gc.campaign_type), - campaign_define(gc.campaign_define), - campaign_xtra_defines(gc.campaign_xtra_defines), - campaign(gc.campaign), - abbrev(gc.abbrev), - completion(gc.completion), - end_credits(gc.end_credits), - end_text(gc.end_text), - end_text_duration(gc.end_text_duration), - difficulty(gc.difficulty), - random_mode(gc.random_mode) -{ -} - -config game_classification::to_config() const -{ - config cfg; - - cfg["label"] = label; - cfg["version"] = game_config::version; - cfg["campaign_type"] = lexical_cast (campaign_type); - cfg["campaign_define"] = campaign_define; - cfg["campaign_extra_defines"] = utils::join(campaign_xtra_defines); - cfg["campaign"] = campaign; - cfg["abbrev"] = abbrev; - cfg["completion"] = completion; - cfg["end_credits"] = end_credits; - cfg["end_text"] = end_text; - cfg["end_text_duration"] = str_cast(end_text_duration); - cfg["difficulty"] = difficulty; - cfg["random_mode"] = random_mode; - - return cfg; -} diff --git a/src/gamestatus.hpp b/src/gamestatus.hpp index 937daa341526..f46a903091d4 100644 --- a/src/gamestatus.hpp +++ b/src/gamestatus.hpp @@ -20,9 +20,7 @@ #include "config.hpp" #include "game_end_exceptions.hpp" #include "game_events/wmi_container.hpp" -#include "make_enum.hpp" #include "map_location.hpp" -#include "mp_game_settings.hpp" #include "simple_rng.hpp" #include @@ -35,22 +33,13 @@ class t_string; class team; class unit_map; -// Defined later in this header: -class game_data; - namespace t_translation { struct t_match; } - +extern int sdfasf; class team_builder; typedef boost::shared_ptr team_builder_ptr; - -/// The default difficulty setting for campaigns. -extern const std::string DEFAULT_DIFFICULTY; - - - class game_data : public variable_set { public: game_data(); @@ -125,40 +114,4 @@ class game_data : public variable_set { std::string next_scenario_; /**< the scenario coming next (for campaigns) */ }; -//meta information of the game -class game_classification : public savegame::savegame_config -{ -public: - game_classification(); - explicit game_classification(const config& cfg); - game_classification(const game_classification& gc); - - config to_config() const; - - std::string label; /**< Name of the game (e.g. name of save file). */ - std::string version; /**< Version game was created with. */ - MAKE_ENUM (CAMPAIGN_TYPE, /**< Type of the game - campaign, multiplayer etc. */ - (SCENARIO, "scenario") - (MULTIPLAYER, "multiplayer") - (TEST, "test") - (TUTORIAL, "tutorial") - ) - CAMPAIGN_TYPE campaign_type; - std::string campaign_define; /**< If there is a define the campaign uses to customize data */ - std::vector campaign_xtra_defines; /**< more customization of data */ - - std::string campaign; /**< the campaign being played */ - - std::string abbrev; /**< the campaign abbreviation */ -// std::string scenario; /**< the scenario being played */ -// std::string next_scenario; /**< the scenario coming next (for campaigns) */ - std::string completion; /**< running. victory, or defeat */ - bool end_credits; /**< whether to show the standard credits at the end */ - std::string end_text; /**< end-of-campaign text */ - unsigned int end_text_duration; /**< for how long the end-of-campaign text is shown */ - std::string difficulty; /**< The difficulty level the game is being played on. */ - std::string random_mode; -}; -MAKE_ENUM_STREAM_OPS2(game_classification, CAMPAIGN_TYPE) - #endif diff --git a/src/gui/dialogs/chat_log.cpp b/src/gui/dialogs/chat_log.cpp index 439beebda39c..dd42d8921380 100644 --- a/src/gui/dialogs/chat_log.cpp +++ b/src/gui/dialogs/chat_log.cpp @@ -32,7 +32,6 @@ #include "../../clipboard.hpp" #include "../../game_preferences.hpp" -#include "../../gamestatus.hpp" #include "../../log.hpp" #include "../../resources.hpp" #include "../../team.hpp" diff --git a/src/gui/dialogs/game_load.cpp b/src/gui/dialogs/game_load.cpp index f6d7c29f2928..129d86b905fc 100644 --- a/src/gui/dialogs/game_load.cpp +++ b/src/gui/dialogs/game_load.cpp @@ -20,7 +20,7 @@ #include "gettext.hpp" #include "game_config.hpp" #include "game_preferences.hpp" -#include "gamestatus.hpp" +#include "game_classification.hpp" #include "gui/auxiliary/log.hpp" #include "gui/dialogs/field.hpp" #include "gui/dialogs/game_delete.hpp" diff --git a/src/multiplayer_connect.hpp b/src/multiplayer_connect.hpp index ff219552075d..802bc288795b 100644 --- a/src/multiplayer_connect.hpp +++ b/src/multiplayer_connect.hpp @@ -18,7 +18,6 @@ #define MULTIPLAYER_CONNECT_H_INCLUDED #include "commandline_options.hpp" -#include "gamestatus.hpp" #include "multiplayer_connect_engine.hpp" #include "multiplayer_ui.hpp" #include "widgets/combo_drag.hpp" diff --git a/src/multiplayer_ui.cpp b/src/multiplayer_ui.cpp index 63f1c421bdfe..9a8ada6eb7b0 100644 --- a/src/multiplayer_ui.cpp +++ b/src/multiplayer_ui.cpp @@ -15,7 +15,6 @@ #include "global.hpp" #include "construct_dialog.hpp" -#include "gamestatus.hpp" #include "game_display.hpp" #include "game_preferences.hpp" #include "gettext.hpp" diff --git a/src/multiplayer_wait.hpp b/src/multiplayer_wait.hpp index 066166f9e91f..af052223fa02 100644 --- a/src/multiplayer_wait.hpp +++ b/src/multiplayer_wait.hpp @@ -16,7 +16,6 @@ #define MULTIPLAYER_WAIT_HPP_INCLUDED #include "flg_manager.hpp" -#include "gamestatus.hpp" #include "multiplayer_ui.hpp" #include "show_dialog.hpp" #include "widgets/combo.hpp" diff --git a/src/replay_controller.hpp b/src/replay_controller.hpp index fcbf912a363a..d154a2fd9153 100644 --- a/src/replay_controller.hpp +++ b/src/replay_controller.hpp @@ -17,7 +17,6 @@ #define REPLAY_CONTROLLER_H_INCLUDED #include "game_end_exceptions.hpp" -#include "gamestatus.hpp" #include "saved_game.hpp" #include "play_controller.hpp" diff --git a/src/save_index.cpp b/src/save_index.cpp index 31c0b3eff5e8..acad98503163 100644 --- a/src/save_index.cpp +++ b/src/save_index.cpp @@ -28,7 +28,6 @@ #include "serialization/binary_or_text.hpp" #include "serialization/parser.hpp" -#include "gamestatus.hpp" #include "filesystem.hpp" #include "config.hpp" #include diff --git a/src/save_index.hpp b/src/save_index.hpp index 77f303775187..fbffb80ffce4 100644 --- a/src/save_index.hpp +++ b/src/save_index.hpp @@ -16,10 +16,6 @@ #ifndef SAVE_INDEX_H_INCLUDED #define SAVE_INDEX_H_INCLUDED -//#include "filesystem.hpp" -//#include "gamestatus.hpp" -//#include "tod_manager.hpp" -//#include "show_dialog.hpp" #include "config.hpp" #include "serialization/compression.hpp" diff --git a/src/saved_game.cpp b/src/saved_game.cpp index c5f0e16441a8..401ba8534652 100644 --- a/src/saved_game.cpp +++ b/src/saved_game.cpp @@ -35,7 +35,6 @@ */ #include "saved_game.hpp" -#include "gamestatus.hpp" #include "carryover.hpp" #include "cursor.hpp" #include "log.hpp" diff --git a/src/saved_game.hpp b/src/saved_game.hpp index 6e1458be88aa..f59e145575d7 100644 --- a/src/saved_game.hpp +++ b/src/saved_game.hpp @@ -3,7 +3,8 @@ #define SAVED_GAME_HPP_INCLUDED #include "config.hpp" -#include "gamestatus.hpp" //game_classification +#include "game_classification.hpp" +#include "mp_game_settings.hpp" class config_writer; diff --git a/src/savegame.hpp b/src/savegame.hpp index 41a587c24919..5fa54c9c54c5 100644 --- a/src/savegame.hpp +++ b/src/savegame.hpp @@ -17,7 +17,6 @@ #define SAVEGAME_H_INCLUDED #include "filesystem.hpp" -#include "gamestatus.hpp" #include "saved_game.hpp" #include "show_dialog.hpp" #include "serialization/compression.hpp" diff --git a/src/scripting/lua.cpp b/src/scripting/lua.cpp index abe081cf42a8..6a5c98fa84a5 100644 --- a/src/scripting/lua.cpp +++ b/src/scripting/lua.cpp @@ -41,6 +41,7 @@ #include "ai/testing/stage_rca.hpp" #include "attack_prediction.hpp" #include "filesystem.hpp" +#include "game_classification.hpp" #include "game_display.hpp" #include "game_events/conditional_wml.hpp" #include "game_events/pump.hpp" @@ -51,6 +52,7 @@ #include "lua_jailbreak_exception.hpp" #include "map.hpp" #include "map_label.hpp" +#include "mp_game_settings.hpp" #include "pathfind/pathfind.hpp" #include "pathfind/teleport.hpp" #include "play_controller.hpp" diff --git a/src/synced_context.cpp b/src/synced_context.cpp index 5b07b15d60d5..a9e80570d028 100644 --- a/src/synced_context.cpp +++ b/src/synced_context.cpp @@ -6,6 +6,7 @@ #include "global.hpp" #include "config.hpp" #include "config_assign.hpp" +#include "game_classification.hpp" #include "replay.hpp" #include "random_new.hpp" #include "random_new_synced.hpp" diff --git a/src/unit_abilities.cpp b/src/unit_abilities.cpp index d67aed7b90bb..cd2fffae11b0 100644 --- a/src/unit_abilities.cpp +++ b/src/unit_abilities.cpp @@ -17,7 +17,6 @@ * Manage unit-abilities, like heal, cure, and weapon_specials. */ -#include "gamestatus.hpp" #include "log.hpp" #include "resources.hpp" #include "terrain_filter.hpp"