From fff0d9b9f9650d9abd7e546d93dc5c4803addfec Mon Sep 17 00:00:00 2001 From: Iurii Chernyi Date: Tue, 9 Jun 2009 13:00:46 +0000 Subject: [PATCH] file renames in src/ai --- projectfiles/CodeBlocks-SCons/wesnoth.cbp | 40 ++--- projectfiles/CodeBlocks/wesnoth.cbp | 40 ++--- projectfiles/VC9/wesnoth.vcproj | 156 ++++++++++-------- src/CMakeLists.txt | 22 +-- src/Makefile.am | 22 +-- src/SConscript | 22 +-- src/ai/{ai_actions.cpp => actions.cpp} | 7 +- src/ai/{ai_actions.hpp => actions.hpp} | 7 +- src/ai/{ai2.hpp => ai2/ai.hpp} | 12 +- src/ai/composite/ai.cpp | 2 +- src/ai/composite/ai.hpp | 2 +- ...ai_configuration.cpp => configuration.cpp} | 6 +- ...ai_configuration.hpp => configuration.hpp} | 6 +- src/ai/contexts.cpp | 3 +- src/ai/contexts.hpp | 2 +- src/ai/{ => default}/ai.cpp | 36 ++-- src/ai/{ => default}/ai.hpp | 18 +- src/ai/{ai_attack.cpp => default/attack.cpp} | 12 +- src/ai/{ai_move.cpp => default/move.cpp} | 15 +- .../{ai_village.cpp => default/village.cpp} | 8 +- src/ai/{ai_dfool.cpp => dfool/ai.cpp} | 13 +- src/ai/{ai_dfool.hpp => dfool/ai.hpp} | 19 ++- src/ai/{formula_ai.cpp => formula/ai.cpp} | 21 +-- src/ai/{formula_ai.hpp => formula/ai.hpp} | 17 +- .../candidates.cpp} | 8 +- .../candidates.hpp} | 7 +- src/ai/{ai_interface.cpp => interface.cpp} | 4 +- src/ai/{ai_interface.hpp => interface.hpp} | 10 +- src/ai/{ai_manager.cpp => manager.cpp} | 16 +- src/ai/{ai_manager.hpp => manager.hpp} | 5 +- src/ai/registry.cpp | 8 +- src/ai/testing.cpp | 2 +- src/ai/testing/stage_fallback.cpp | 2 +- src/ai/testing/stage_fallback.hpp | 2 +- src/game_events.cpp | 2 +- src/menu_events.cpp | 2 +- src/multiplayer_connect.cpp | 2 +- src/playsingle_controller.cpp | 2 +- src/team.cpp | 2 +- 39 files changed, 310 insertions(+), 272 deletions(-) rename src/ai/{ai_actions.cpp => actions.cpp} (99%) rename src/ai/{ai_actions.hpp => actions.hpp} (99%) rename src/ai/{ai2.hpp => ai2/ai.hpp} (85%) rename src/ai/{ai_configuration.cpp => configuration.cpp} (98%) rename src/ai/{ai_configuration.hpp => configuration.hpp} (96%) rename src/ai/{ => default}/ai.cpp (99%) rename src/ai/{ => default}/ai.hpp (98%) rename src/ai/{ai_attack.cpp => default/attack.cpp} (99%) rename src/ai/{ai_move.cpp => default/move.cpp} (99%) rename src/ai/{ai_village.cpp => default/village.cpp} (99%) rename src/ai/{ai_dfool.cpp => dfool/ai.cpp} (99%) rename src/ai/{ai_dfool.hpp => dfool/ai.hpp} (93%) rename src/ai/{formula_ai.cpp => formula/ai.cpp} (99%) rename src/ai/{formula_ai.hpp => formula/ai.hpp} (94%) rename src/ai/{formula_candidates.cpp => formula/candidates.cpp} (98%) rename src/ai/{formula_candidates.hpp => formula/candidates.hpp} (97%) rename src/ai/{ai_interface.cpp => interface.cpp} (93%) rename src/ai/{ai_interface.hpp => interface.hpp} (96%) rename src/ai/{ai_manager.cpp => manager.cpp} (99%) rename src/ai/{ai_manager.hpp => manager.hpp} (99%) diff --git a/projectfiles/CodeBlocks-SCons/wesnoth.cbp b/projectfiles/CodeBlocks-SCons/wesnoth.cbp index 7f529b57705..63cbadeacfc 100644 --- a/projectfiles/CodeBlocks-SCons/wesnoth.cbp +++ b/projectfiles/CodeBlocks-SCons/wesnoth.cbp @@ -45,22 +45,9 @@ - - - - - - - - - - - - - - - - + + + @@ -73,16 +60,29 @@ + + + + + - - - - + + + + + + + + + + + + diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp index eee9898a798..b5e8d333256 100644 --- a/projectfiles/CodeBlocks/wesnoth.cbp +++ b/projectfiles/CodeBlocks/wesnoth.cbp @@ -76,22 +76,9 @@ - - - - - - - - - - - - - - - - + + + @@ -104,16 +91,29 @@ + + + + + - - - - + + + + + + + + + + + + diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj index 87816fd453b..e585c7499b6 100644 --- a/projectfiles/VC9/wesnoth.vcproj +++ b/projectfiles/VC9/wesnoth.vcproj @@ -2686,57 +2686,29 @@ Name="AI" > - - - - - - - - - - - - - - - - - - + + + + @@ -2776,10 +2748,46 @@ + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + @@ -3640,6 +3628,14 @@ RelativePath="..\..\src\ai\testing.hpp" > + + + + @@ -3671,11 +3667,35 @@ + + + + + + + + + + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 095b7485f40..ae50514bbb8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -217,26 +217,26 @@ SET(wesnoth-main_SRC actions.cpp addon_checks.cpp addon_management.cpp - ai/ai.cpp - ai/ai_actions.cpp - ai/ai_attack.cpp - ai/ai_configuration.cpp - ai/ai_interface.cpp - ai/ai_dfool.cpp - ai/ai_manager.cpp - ai/ai_move.cpp - ai/ai_village.cpp + ai/actions.cpp ai/composite/ai.cpp ai/composite/contexts.cpp ai/composite/engine.cpp ai/composite/engine_default.cpp ai/composite/rca.cpp ai/composite/stage.cpp + ai/configuration.cpp ai/contexts.cpp + ai/default/ai.cpp + ai/default/attack.cpp ai/default/contexts.cpp - ai/formula_ai.cpp - ai/formula_candidates.cpp + ai/default/move.cpp + ai/default/village.cpp + ai/dfool/ai.cpp + ai/formula/ai.cpp + ai/formula/candidates.cpp ai/game_info.cpp + ai/interface.cpp + ai/manager.cpp ai/registry.cpp ai/testing/ca.cpp ai/testing/stage_rca.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 442e9a66fa1..992b48fbbf9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,26 +42,26 @@ wesnoth_source = \ actions.cpp \ addon_checks.cpp \ addon_management.cpp \ - ai/ai.cpp \ - ai/ai_actions.cpp \ - ai/ai_attack.cpp \ - ai/ai_configuration.cpp \ - ai/ai_dfool.cpp \ - ai/ai_interface.cpp \ - ai/ai_manager.cpp \ - ai/ai_move.cpp \ - ai/ai_village.cpp \ + ai/actions.cpp \ ai/composite/ai.cpp \ ai/composite/contexts.cpp \ ai/composite/engine.cpp \ ai/composite/engine_default.cpp \ ai/composite/rca.cpp \ ai/composite/stage.cpp \ + ai/configuration.cpp \ ai/contexts.cpp \ + ai/default/ai.cpp \ + ai/default/attack.cpp \ ai/default/contexts.cpp \ - ai/formula_ai.cpp \ - ai/formula_candidates.cpp \ + ai/default/move.cpp \ + ai/default/village.cpp \ + ai/dfool/ai.cpp \ + ai/formula/ai.cpp \ + ai/formula/candidates.cpp \ ai/game_info.cpp \ + ai/interface.cpp \ + ai/manager.cpp \ ai/registry.cpp \ ai/testing/ca.cpp \ ai/testing/stage_rca.cpp \ diff --git a/src/SConscript b/src/SConscript index 68f08fcaf11..0665816db33 100644 --- a/src/SConscript +++ b/src/SConscript @@ -147,26 +147,26 @@ wesnoth_sources = Split(""" actions.cpp addon_checks.cpp addon_management.cpp - ai/ai.cpp - ai/ai_attack.cpp - ai/ai_actions.cpp - ai/ai_configuration.cpp - ai/ai_dfool.cpp - ai/ai_interface.cpp - ai/ai_manager.cpp - ai/ai_move.cpp - ai/ai_village.cpp + ai/actions.cpp ai/composite/ai.cpp ai/composite/contexts.cpp ai/composite/engine.cpp ai/composite/engine_default.cpp ai/composite/rca.cpp ai/composite/stage.cpp + ai/configuration.cpp ai/contexts.cpp + ai/default/ai.cpp + ai/default/attack.cpp ai/default/contexts.cpp - ai/formula_ai.cpp - ai/formula_candidates.cpp + ai/default/move.cpp + ai/default/village.cpp + ai/dfool/ai.cpp + ai/formula/ai.cpp + ai/formula/candidates.cpp ai/game_info.cpp + ai/interface.cpp + ai/manager.cpp ai/registry.cpp ai/testing/ca.cpp ai/testing/stage_rca.cpp diff --git a/src/ai/ai_actions.cpp b/src/ai/actions.cpp similarity index 99% rename from src/ai/ai_actions.cpp rename to src/ai/actions.cpp index d5fb5740201..03437ecf7b0 100644 --- a/src/ai/ai_actions.cpp +++ b/src/ai/actions.cpp @@ -14,7 +14,7 @@ /** * Managing the AI-Game interaction - AI actions and their results - * @file ai/ai_actions.cpp + * @file ai/actions.cpp */ /** @@ -32,8 +32,9 @@ * So far the use of 'subjective info' is stubbed out. */ -#include "ai_actions.hpp" -#include "ai_manager.hpp" +#include "actions.hpp" +#include "manager.hpp" + #include "../actions.hpp" #include "../game_preferences.hpp" #include "../log.hpp" diff --git a/src/ai/ai_actions.hpp b/src/ai/actions.hpp similarity index 99% rename from src/ai/ai_actions.hpp rename to src/ai/actions.hpp index 93d9fb6642f..ced635cf371 100644 --- a/src/ai/ai_actions.hpp +++ b/src/ai/actions.hpp @@ -14,15 +14,16 @@ /** * Managing the AI-Game interaction - AI actions and their results - * @file ai/ai_actions.hpp + * @file ai/actions.hpp * */ -#ifndef AI_AI_ACTIONS_HPP_INCLUDED -#define AI_AI_ACTIONS_HPP_INCLUDED +#ifndef AI_ACTIONS_HPP_INCLUDED +#define AI_ACTIONS_HPP_INCLUDED #include "../global.hpp" #include "game_info.hpp" + #include "../map.hpp" #include "../map_location.hpp" #include "../pathfind.hpp" diff --git a/src/ai/ai2.hpp b/src/ai/ai2/ai.hpp similarity index 85% rename from src/ai/ai2.hpp rename to src/ai/ai2/ai.hpp index a4f0ce40334..2f2bb6fd42e 100644 --- a/src/ai/ai2.hpp +++ b/src/ai/ai2/ai.hpp @@ -13,15 +13,15 @@ */ /** - * @file ai/ai2.hpp - * AI-interface part 2, virtual. + * @file ai/ai2/ai.hpp + * Stub AI */ -#ifndef AI_AI2_HPP_INCLUDED -#define AI_AI2_HPP_INCLUDED +#ifndef AI_AI2_AI_HPP_INCLUDED +#define AI_AI2_AI_HPP_INCLUDED -#include "ai_interface.hpp" -#include "contexts.hpp" +#include "../interface.hpp" +#include "../contexts.hpp" namespace ai { diff --git a/src/ai/composite/ai.cpp b/src/ai/composite/ai.cpp index 80904089fbd..979fc9f02a1 100644 --- a/src/ai/composite/ai.cpp +++ b/src/ai/composite/ai.cpp @@ -19,7 +19,7 @@ #include "ai.hpp" #include "stage.hpp" -#include "../ai_manager.hpp" +#include "../manager.hpp" #include "../../foreach.hpp" #include "../../log.hpp" diff --git a/src/ai/composite/ai.hpp b/src/ai/composite/ai.hpp index 52c75b62b87..4c13bb5900a 100644 --- a/src/ai/composite/ai.hpp +++ b/src/ai/composite/ai.hpp @@ -27,7 +27,7 @@ #include "stage.hpp" #include "../contexts.hpp" #include "../default/contexts.hpp" -#include "../ai_interface.hpp" +#include "../interface.hpp" #include diff --git a/src/ai/ai_configuration.cpp b/src/ai/configuration.cpp similarity index 98% rename from src/ai/ai_configuration.cpp rename to src/ai/configuration.cpp index e8d097afdef..12b1f750abe 100644 --- a/src/ai/ai_configuration.cpp +++ b/src/ai/configuration.cpp @@ -15,9 +15,11 @@ /** * Managing the AI configuration - * @file ai/ai_configuration.cpp + * @file ai/configuration.cpp */ -#include "ai_configuration.hpp" + +#include "configuration.hpp" + #include "../filesystem.hpp" #include "../foreach.hpp" #include "../log.hpp" diff --git a/src/ai/ai_configuration.hpp b/src/ai/configuration.hpp similarity index 96% rename from src/ai/ai_configuration.hpp rename to src/ai/configuration.hpp index f52ead37d82..e06cd07a5d6 100644 --- a/src/ai/ai_configuration.hpp +++ b/src/ai/configuration.hpp @@ -14,11 +14,11 @@ /** * Managing the AIs configuration - headers - * @file ai/ai_configuration.hpp + * @file ai/configuration.hpp * */ -#ifndef AI_AI_CONFIGURATION_HPP_INCLUDED -#define AI_AI_CONFIGURATION_HPP_INCLUDED +#ifndef AI_CONFIGURATION_HPP_INCLUDED +#define AI_CONFIGURATION_HPP_INCLUDED #include "../global.hpp" diff --git a/src/ai/contexts.cpp b/src/ai/contexts.cpp index 743549dcaf8..d9c55897db5 100644 --- a/src/ai/contexts.cpp +++ b/src/ai/contexts.cpp @@ -19,8 +19,7 @@ */ #include "contexts.hpp" -#include "ai_actions.hpp" -#include "ai_manager.hpp" +#include "manager.hpp" #include "../callable_objects.hpp" #include "../dialogs.hpp" #include "../formula.hpp" diff --git a/src/ai/contexts.hpp b/src/ai/contexts.hpp index 30b85682eab..e9503c3c68e 100644 --- a/src/ai/contexts.hpp +++ b/src/ai/contexts.hpp @@ -24,7 +24,7 @@ class game_display; class gamemap; -#include "ai_actions.hpp" +#include "actions.hpp" #include "game_info.hpp" #include "../game_display.hpp" #include "../gamestatus.hpp" diff --git a/src/ai/ai.cpp b/src/ai/default/ai.cpp similarity index 99% rename from src/ai/ai.cpp rename to src/ai/default/ai.cpp index d24ac020d6a..cedff43c9c4 100644 --- a/src/ai/ai.cpp +++ b/src/ai/default/ai.cpp @@ -13,26 +13,28 @@ */ /** - * @file ai/ai.cpp + * @file ai/default/ai.cpp * Artificial intelligence - The computer commands the enemy. */ -#include "ai2.hpp" -#include "ai_dfool.hpp" -#include "ai_manager.hpp" -#include "../array.hpp" -#include "../dialogs.hpp" -#include "../foreach.hpp" -#include "formula_ai.hpp" -#include "../game_end_exceptions.hpp" -#include "../game_events.hpp" -#include "../game_preferences.hpp" -#include "../log.hpp" -#include "../mouse_handler_base.hpp" -#include "../replay.hpp" -#include "../statistics.hpp" -#include "../unit_display.hpp" -#include "../wml_exception.hpp" +#include "ai.hpp" + +#include "../dfool/ai.hpp" +#include "../manager.hpp" +#include "../formula/ai.hpp" + +#include "../../array.hpp" +#include "../../dialogs.hpp" +#include "../../foreach.hpp" +#include "../../game_end_exceptions.hpp" +#include "../../game_events.hpp" +#include "../../game_preferences.hpp" +#include "../../log.hpp" +#include "../../mouse_handler_base.hpp" +#include "../../replay.hpp" +#include "../../statistics.hpp" +#include "../../unit_display.hpp" +#include "../../wml_exception.hpp" #include diff --git a/src/ai/ai.hpp b/src/ai/default/ai.hpp similarity index 98% rename from src/ai/ai.hpp rename to src/ai/default/ai.hpp index c5a26e102d8..b99e73a55cc 100644 --- a/src/ai/ai.hpp +++ b/src/ai/default/ai.hpp @@ -12,18 +12,20 @@ See the COPYING file for more details. */ -/** @file ai/ai.hpp */ +/** @file ai/default/ai.hpp */ -#ifndef AI_AI_HPP_INCLUDED -#define AI_AI_HPP_INCLUDED +#ifndef AI_DEFAULT_AI_HPP_INCLUDED +#define AI_DEFAULT_AI_HPP_INCLUDED -#include "../global.hpp" +#include "../../global.hpp" + +#include "contexts.hpp" #include "../actions.hpp" -#include "ai_interface.hpp" -#include "contexts.hpp" -#include "default/contexts.hpp" -#include "../formula_callable.hpp" +#include "../interface.hpp" +#include "../contexts.hpp" + +#include "../../formula_callable.hpp" class formula_ai; diff --git a/src/ai/ai_attack.cpp b/src/ai/default/attack.cpp similarity index 99% rename from src/ai/ai_attack.cpp rename to src/ai/default/attack.cpp index 312ffcc67b4..c629f67b84e 100644 --- a/src/ai/ai_attack.cpp +++ b/src/ai/default/attack.cpp @@ -13,17 +13,17 @@ */ /** - * @file ai/ai_attack.cpp - * Calculate & analyse attacks. + * @file ai/default/attack.cpp + * Calculate & analyse attacks of the default ai */ -#include "../global.hpp" +#include "../../global.hpp" #include "ai.hpp" -#include "../attack_prediction.hpp" -#include "../map.hpp" -#include "../log.hpp" +#include "../../attack_prediction.hpp" +#include "../../map.hpp" +#include "../../log.hpp" static lg::log_domain log_ai("ai/attack"); #define LOG_AI LOG_STREAM(info, log_ai) diff --git a/src/ai/ai_move.cpp b/src/ai/default/move.cpp similarity index 99% rename from src/ai/ai_move.cpp rename to src/ai/default/move.cpp index a598b28f3da..a2894bc9aa0 100644 --- a/src/ai/ai_move.cpp +++ b/src/ai/default/move.cpp @@ -14,18 +14,19 @@ /** * AI Move decision support - * @file ai/ai_move.cpp + * @file ai/default/move.cpp * */ -#include "../global.hpp" +#include "../../global.hpp" #include "ai.hpp" -#include "foreach.hpp" -#include "../gettext.hpp" -#include "../log.hpp" -#include "../map.hpp" -#include "../wml_exception.hpp" + +#include "../../foreach.hpp" +#include "../../gettext.hpp" +#include "../../log.hpp" +#include "../../map.hpp" +#include "../../wml_exception.hpp" static lg::log_domain log_ai("ai/move"); diff --git a/src/ai/ai_village.cpp b/src/ai/default/village.cpp similarity index 99% rename from src/ai/ai_village.cpp rename to src/ai/default/village.cpp index fbd5c2ea9a1..6114d60b14f 100644 --- a/src/ai/ai_village.cpp +++ b/src/ai/default/village.cpp @@ -13,16 +13,16 @@ */ /** - * @file ai/ai_village.cpp + * @file ai/default/village.cpp * The village capturing part of the AI. * ai_default::get_villages and ai_default::find_villages are based on ai_default::get_villages in ai.cpp */ -#include "../global.hpp" +#include "../../global.hpp" #include "ai.hpp" -#include "../log.hpp" -#include "../map.hpp" +#include "../../log.hpp" +#include "../../map.hpp" #include diff --git a/src/ai/ai_dfool.cpp b/src/ai/dfool/ai.cpp similarity index 99% rename from src/ai/ai_dfool.cpp rename to src/ai/dfool/ai.cpp index b0c56054434..7c20d87c9f9 100644 --- a/src/ai/ai_dfool.cpp +++ b/src/ai/dfool/ai.cpp @@ -12,14 +12,15 @@ See the COPYING file for more details. */ -/** @file ai/ai_dfool.cpp */ +/** @file ai/dfool/ai.cpp */ -#include "../global.hpp" +#include "../../global.hpp" -#include "ai_dfool.hpp" -#include "../foreach.hpp" -#include "../log.hpp" -#include "../formula_string_utils.hpp" +#include "ai.hpp" + +#include "../../foreach.hpp" +#include "../../log.hpp" +#include "../../formula_string_utils.hpp" namespace ai { diff --git a/src/ai/ai_dfool.hpp b/src/ai/dfool/ai.hpp similarity index 93% rename from src/ai/ai_dfool.hpp rename to src/ai/dfool/ai.hpp index dace6027a44..bdfe895226d 100644 --- a/src/ai/ai_dfool.hpp +++ b/src/ai/dfool/ai.hpp @@ -13,20 +13,21 @@ */ /** - * @file ai/ai_dfool.hpp + * @file ai/dfool/ai.hpp * This ai uses for its decisions only units it has "seen". */ -#ifndef AI_AI_DFOOL_HPP_INCLUDED -#define AI_AI_DFOOL_HPP_INCLUDED +#ifndef AI_DFOOL_AI_HPP_INCLUDED +#define AI_DFOOL_AI_HPP_INCLUDED -#include "../global.hpp" +#include "../../global.hpp" -#include "ai_interface.hpp" -#include "contexts.hpp" -#include "../map_location.hpp" -#include "../unit_map.hpp" -#include "../unit.hpp" +#include "../interface.hpp" +#include "../contexts.hpp" + +#include "../../map_location.hpp" +#include "../../unit_map.hpp" +#include "../../unit.hpp" #include #include diff --git a/src/ai/formula_ai.cpp b/src/ai/formula/ai.cpp similarity index 99% rename from src/ai/formula_ai.cpp rename to src/ai/formula/ai.cpp index 3e1e3fa85a0..4c03474eb22 100644 --- a/src/ai/formula_ai.cpp +++ b/src/ai/formula/ai.cpp @@ -22,17 +22,18 @@ #include #include -#include "../foreach.hpp" -#include "../unit.hpp" +#include "ai.hpp" -#include "ai_manager.hpp" -#include "../menu_events.hpp" -#include "../filesystem.hpp" -#include "../foreach.hpp" -#include "formula_ai.hpp" -#include "../log.hpp" -#include "../attack_prediction.hpp" -#include "formula_candidates.hpp" +#include "../manager.hpp" + +#include "../../foreach.hpp" +#include "../../unit.hpp" +#include "../../menu_events.hpp" +#include "../../filesystem.hpp" +#include "../../foreach.hpp" +#include "../../log.hpp" +#include "../../attack_prediction.hpp" +#include "candidates.hpp" static lg::log_domain log_formula_ai("ai/formula_ai"); #define LOG_AI LOG_STREAM(info, log_formula_ai) diff --git a/src/ai/formula_ai.hpp b/src/ai/formula/ai.hpp similarity index 94% rename from src/ai/formula_ai.hpp rename to src/ai/formula/ai.hpp index c6042bd2000..3204127076c 100644 --- a/src/ai/formula_ai.hpp +++ b/src/ai/formula/ai.hpp @@ -13,7 +13,7 @@ */ /** - * @file ai/formula_ai.hpp + * @file ai/formula/ai.hpp * Defines formula ai * */ @@ -21,13 +21,14 @@ #ifndef AI_FORMULA_AI_HPP_INCLUDED #define AI_FORMULA_AI_HPP_INCLUDED -#include "ai.hpp" -#include "../callable_objects.hpp" -#include "../formula.hpp" -#include "../formula_fwd.hpp" -#include "../formula_callable.hpp" -#include "formula_candidates.hpp" -#include "../formula_function.hpp" +#include "../default/ai.hpp" +#include "../../callable_objects.hpp" +#include "../../formula.hpp" +#include "../../formula_fwd.hpp" +#include "../../formula_callable.hpp" +#include "../../formula_function.hpp" + +#include "candidates.hpp" // Forward declaration needed for ai function symbol table class formula_ai; diff --git a/src/ai/formula_candidates.cpp b/src/ai/formula/candidates.cpp similarity index 98% rename from src/ai/formula_candidates.cpp rename to src/ai/formula/candidates.cpp index 55c959c6269..95c175a2019 100644 --- a/src/ai/formula_candidates.cpp +++ b/src/ai/formula/candidates.cpp @@ -12,13 +12,13 @@ */ /** - * @file ai/formula_candidates.cpp + * @file ai/formula/candidates.cpp * Defines formula ai candidate actions * */ -#include "formula_ai.hpp" -#include "formula_candidates.hpp" -#include "../log.hpp" +#include "ai.hpp" +#include "candidates.hpp" +#include "../../log.hpp" static lg::log_domain log_formula_ai("ai/formula_ai"); #define ERR_AI LOG_STREAM(err, log_formula_ai) diff --git a/src/ai/formula_candidates.hpp b/src/ai/formula/candidates.hpp similarity index 97% rename from src/ai/formula_candidates.hpp rename to src/ai/formula/candidates.hpp index 12ce191b716..16657fec381 100644 --- a/src/ai/formula_candidates.hpp +++ b/src/ai/formula/candidates.hpp @@ -12,13 +12,18 @@ */ /** - * @file ai/formula_candidates.hpp + * @file ai/formula/candidates.hpp * Defines formula ai candidate actions - headers * */ #ifndef AI_FORMULA_CANDIDATES_HPP_INCLUDED #define AI_FORMULA_CANDIDATES_HPP_INCLUDED +#include "../../global.hpp" + +#include "../../formula_fwd.hpp" +#include "../../formula_function.hpp" + namespace game_logic { class base_candidate_action; diff --git a/src/ai/ai_interface.cpp b/src/ai/interface.cpp similarity index 93% rename from src/ai/ai_interface.cpp rename to src/ai/interface.cpp index 2e7443cd172..8110ecd59e1 100644 --- a/src/ai/ai_interface.cpp +++ b/src/ai/interface.cpp @@ -14,10 +14,10 @@ /** * Base class for the AI and AI-ai_manager contract. - * @file ai/ai_interface.cpp + * @file ai/interface.cpp */ -#include "ai_interface.hpp" +#include "interface.hpp" namespace ai { diff --git a/src/ai/ai_interface.hpp b/src/ai/interface.hpp similarity index 96% rename from src/ai/ai_interface.hpp rename to src/ai/interface.hpp index dbf9db202c5..ae2202de10e 100644 --- a/src/ai/ai_interface.hpp +++ b/src/ai/interface.hpp @@ -13,19 +13,19 @@ */ /** - * @file ai/ai_interface.hpp + * @file ai/interface.hpp * Interface to the AI. */ -#ifndef AI_AI_INTERFACE_HPP_INCLUDED -#define AI_AI_INTERFACE_HPP_INCLUDED +#ifndef AI_INTERFACE_HPP_INCLUDED +#define AI_INTERFACE_HPP_INCLUDED #include "../global.hpp" -#include "../formula_callable.hpp" - #include "game_info.hpp" +#include "../formula_callable.hpp" + #include "default/contexts.hpp" namespace ai { diff --git a/src/ai/ai_manager.cpp b/src/ai/manager.cpp similarity index 99% rename from src/ai/ai_manager.cpp rename to src/ai/manager.cpp index 43e6e5fdf00..f060b641907 100644 --- a/src/ai/ai_manager.cpp +++ b/src/ai/manager.cpp @@ -14,17 +14,17 @@ /** * Managing the AI lifecycle and interface for the rest of Wesnoth - * @file ai/ai_manager.cpp + * @file ai/manager.cpp */ -#include "ai.hpp" -#include "ai2.hpp" -#include "ai_configuration.hpp" -#include "ai_manager.hpp" -#include "ai_dfool.hpp" -#include "contexts.hpp" +#include "ai2/ai.hpp" #include "composite/ai.hpp" -#include "formula_ai.hpp" +#include "configuration.hpp" +#include "contexts.hpp" +#include "default/ai.hpp" +#include "dfool/ai.hpp" +#include "manager.hpp" +#include "formula/ai.hpp" #include "registry.hpp" #include "../game_events.hpp" #include "../game_preferences.hpp" diff --git a/src/ai/ai_manager.hpp b/src/ai/manager.hpp similarity index 99% rename from src/ai/ai_manager.hpp rename to src/ai/manager.hpp index 4ec93625e0a..4d5c381e978 100644 --- a/src/ai/ai_manager.hpp +++ b/src/ai/manager.hpp @@ -20,10 +20,11 @@ * @todo 1.7 AI Interface command to clear the history. */ -#ifndef AI_AI_MANAGER_HPP_INCLUDED -#define AI_AI_MANAGER_HPP_INCLUDED +#ifndef AI_MANAGER_HPP_INCLUDED +#define AI_MANAGER_HPP_INCLUDED #include "../global.hpp" + #include "contexts.hpp" #include "game_info.hpp" #include "default/contexts.hpp" diff --git a/src/ai/registry.cpp b/src/ai/registry.cpp index d4744f75a35..e65a1602825 100644 --- a/src/ai/registry.cpp +++ b/src/ai/registry.cpp @@ -17,12 +17,12 @@ * @file ai/registry.cpp */ -#include "ai.hpp" -#include "ai2.hpp" -#include "ai_dfool.hpp" +#include "ai2/ai.hpp" #include "composite/ai.hpp" #include "composite/engine_default.hpp" -#include "formula_ai.hpp" +#include "default/ai.hpp" +#include "dfool/ai.hpp" +#include "formula/ai.hpp" #include "registry.hpp" #include "testing/ca.hpp" #include "testing/stage_rca.hpp" diff --git a/src/ai/testing.cpp b/src/ai/testing.cpp index b6021fe4998..f1e3f5e14b3 100644 --- a/src/ai/testing.cpp +++ b/src/ai/testing.cpp @@ -16,7 +16,7 @@ * Gather statistics important for AI testing and output them * @file ai/testing.cpp */ -#include "ai_manager.hpp" +#include "manager.hpp" #include "testing.hpp" #include "../log.hpp" diff --git a/src/ai/testing/stage_fallback.cpp b/src/ai/testing/stage_fallback.cpp index bcf6d5eeb29..75cd32106ea 100644 --- a/src/ai/testing/stage_fallback.cpp +++ b/src/ai/testing/stage_fallback.cpp @@ -19,7 +19,7 @@ #include "stage_fallback.hpp" -#include "../ai_manager.hpp" +#include "../manager.hpp" #include "../composite/ai.hpp" #include "../../foreach.hpp" #include "../../log.hpp" diff --git a/src/ai/testing/stage_fallback.hpp b/src/ai/testing/stage_fallback.hpp index 4fccbe874dc..1d198dbebcc 100644 --- a/src/ai/testing/stage_fallback.hpp +++ b/src/ai/testing/stage_fallback.hpp @@ -23,7 +23,7 @@ #include "../../global.hpp" #include "../composite/stage.hpp" -#include "../ai_interface.hpp" +#include "../interface.hpp" #include "../../config.hpp" #include diff --git a/src/game_events.cpp b/src/game_events.cpp index d2434a2b408..2c0c198cff3 100644 --- a/src/game_events.cpp +++ b/src/game_events.cpp @@ -20,7 +20,7 @@ #include "global.hpp" #include "actions.hpp" -#include "ai/ai_manager.hpp" +#include "ai/manager.hpp" #include "dialogs.hpp" #include "foreach.hpp" #include "game_end_exceptions.hpp" diff --git a/src/menu_events.cpp b/src/menu_events.cpp index d89f143391a..029285eface 100644 --- a/src/menu_events.cpp +++ b/src/menu_events.cpp @@ -21,7 +21,7 @@ #include "global.hpp" -#include "ai/ai_manager.hpp" +#include "ai/manager.hpp" #include "dialogs.hpp" #include "formatter.hpp" #include "filechooser.hpp" diff --git a/src/multiplayer_connect.cpp b/src/multiplayer_connect.cpp index 78a829b71c5..9683ced8ca7 100644 --- a/src/multiplayer_connect.cpp +++ b/src/multiplayer_connect.cpp @@ -20,7 +20,7 @@ #include "global.hpp" -#include "ai/ai_manager.hpp" +#include "ai/manager.hpp" #include "dialogs.hpp" #include "foreach.hpp" #include "gettext.hpp" diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp index d35a2ae46fa..f5f1d59e81a 100644 --- a/src/playsingle_controller.cpp +++ b/src/playsingle_controller.cpp @@ -21,7 +21,7 @@ #include "playsingle_controller.hpp" -#include "ai/ai_manager.hpp" +#include "ai/manager.hpp" #include "ai/game_info.hpp" #include "ai/testing.hpp" #include "foreach.hpp" diff --git a/src/team.cpp b/src/team.cpp index 4b92ddaa805..9b413a2e8e7 100644 --- a/src/team.cpp +++ b/src/team.cpp @@ -19,7 +19,7 @@ #include "global.hpp" -#include "ai/ai_manager.hpp" +#include "ai/manager.hpp" #include "foreach.hpp" #include "game_events.hpp" #include "gamestatus.hpp"