diff --git a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj index 4684c42912a1..55d13ca5c906 100644 --- a/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj +++ b/projectfiles/Xcode/Wesnoth.xcodeproj/project.pbxproj @@ -39,7 +39,7 @@ 621DEB8415A7BA1F00FEE18A /* highlighter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 621DEB8215A7BA1F00FEE18A /* highlighter.cpp */; }; 62579C7E1573E70C003089D5 /* instance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62579C781573E70C003089D5 /* instance.cpp */; }; 62579C831573E797003089D5 /* matrix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 62579C811573E797003089D5 /* matrix.cpp */; }; - 627F1EDB175AF35C000042E0 /* unit_advancements_aspect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 627F1ED9175AF35C000042E0 /* unit_advancements_aspect.cpp */; }; + 627F1EDB175AF35C000042E0 /* aspect_advancements.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 627F1ED9175AF35C000042E0 /* aspect_advancements.cpp */; }; 6295C3B5150FC95C0077D8C5 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6295C3A7150FC95C0077D8C5 /* action.cpp */; }; 6295C3B6150FC95C0077D8C5 /* action_label.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6295C3AA150FC95C0077D8C5 /* action_label.cpp */; }; 6295C3B7150FC95C0077D8C5 /* action_unit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6295C3AC150FC95C0077D8C5 /* action_unit.cpp */; }; @@ -244,7 +244,7 @@ B54AC6C70FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A40FEA9EB5006F6FBD /* ai.cpp */; }; B54AC6C80FEA9EB5006F6FBD /* contexts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A60FEA9EB5006F6FBD /* contexts.cpp */; }; B54AC6C90FEA9EB5006F6FBD /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A80FEA9EB5006F6FBD /* engine.cpp */; }; - B54AC6CA0FEA9EB5006F6FBD /* engine_default.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AA0FEA9EB5006F6FBD /* engine_default.cpp */; }; + B54AC6CA0FEA9EB5006F6FBD /* engine_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AA0FEA9EB5006F6FBD /* engine_cpp.cpp */; }; B54AC6CB0FEA9EB5006F6FBD /* rca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AC0FEA9EB5006F6FBD /* rca.cpp */; }; B54AC6CC0FEA9EB5006F6FBD /* stage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AE0FEA9EB5006F6FBD /* stage.cpp */; }; B54AC6CE0FEA9EB5006F6FBD /* attack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B30FEA9EB5006F6FBD /* attack.cpp */; }; @@ -256,7 +256,7 @@ B54AC6D80FEA9EB5006F6FBD /* ai.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A40FEA9EB5006F6FBD /* ai.cpp */; }; B54AC6D90FEA9EB5006F6FBD /* contexts.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A60FEA9EB5006F6FBD /* contexts.cpp */; }; B54AC6DA0FEA9EB5006F6FBD /* engine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6A80FEA9EB5006F6FBD /* engine.cpp */; }; - B54AC6DB0FEA9EB5006F6FBD /* engine_default.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AA0FEA9EB5006F6FBD /* engine_default.cpp */; }; + B54AC6DB0FEA9EB5006F6FBD /* engine_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AA0FEA9EB5006F6FBD /* engine_cpp.cpp */; }; B54AC6DC0FEA9EB5006F6FBD /* rca.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AC0FEA9EB5006F6FBD /* rca.cpp */; }; B54AC6DD0FEA9EB5006F6FBD /* stage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6AE0FEA9EB5006F6FBD /* stage.cpp */; }; B54AC6DF0FEA9EB5006F6FBD /* attack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B54AC6B30FEA9EB5006F6FBD /* attack.cpp */; }; @@ -1151,8 +1151,8 @@ 62579C791573E70C003089D5 /* instance.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = instance.hpp; sourceTree = ""; }; 62579C811573E797003089D5 /* matrix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = matrix.cpp; sourceTree = ""; }; 62579C821573E797003089D5 /* matrix.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = matrix.hpp; sourceTree = ""; }; - 627F1ED9175AF35C000042E0 /* unit_advancements_aspect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unit_advancements_aspect.cpp; sourceTree = ""; }; - 627F1EDA175AF35C000042E0 /* unit_advancements_aspect.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = unit_advancements_aspect.hpp; sourceTree = ""; }; + 627F1ED9175AF35C000042E0 /* aspect_advancements.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = aspect_advancements.cpp; sourceTree = ""; }; + 627F1EDA175AF35C000042E0 /* aspect_advancements.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = aspect_advancements.hpp; sourceTree = ""; }; 6295C3A7150FC95C0077D8C5 /* action.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = action.cpp; sourceTree = ""; }; 6295C3A8150FC95C0077D8C5 /* action.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = action.hpp; sourceTree = ""; }; 6295C3A9150FC95C0077D8C5 /* action_base.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = action_base.hpp; sourceTree = ""; }; @@ -1487,8 +1487,8 @@ B54AC6A70FEA9EB5006F6FBD /* contexts.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = contexts.hpp; sourceTree = ""; }; B54AC6A80FEA9EB5006F6FBD /* engine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine.cpp; sourceTree = ""; }; B54AC6A90FEA9EB5006F6FBD /* engine.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = engine.hpp; sourceTree = ""; }; - B54AC6AA0FEA9EB5006F6FBD /* engine_default.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine_default.cpp; sourceTree = ""; }; - B54AC6AB0FEA9EB5006F6FBD /* engine_default.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = engine_default.hpp; sourceTree = ""; }; + B54AC6AA0FEA9EB5006F6FBD /* engine_cpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = engine_cpp.cpp; sourceTree = ""; }; + B54AC6AB0FEA9EB5006F6FBD /* engine_cpp.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = engine_cpp.hpp; sourceTree = ""; }; B54AC6AC0FEA9EB5006F6FBD /* rca.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rca.cpp; sourceTree = ""; }; B54AC6AD0FEA9EB5006F6FBD /* rca.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = rca.hpp; sourceTree = ""; }; B54AC6AE0FEA9EB5006F6FBD /* stage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = stage.cpp; sourceTree = ""; }; @@ -2091,8 +2091,8 @@ EC45DEDC1AD1CEA300BD760C /* countdown_clock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = countdown_clock.cpp; sourceTree = ""; }; EC45DEDE1AD1CED100BD760C /* replay_recorder_base.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = replay_recorder_base.cpp; sourceTree = ""; }; EC45DEE01AD1CEF600BD760C /* floating_label.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = floating_label.cpp; sourceTree = ""; }; - EC48D74B17F3148300DE80BF /* recruitment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = recruitment.cpp; path = recruitment/recruitment.cpp; sourceTree = ""; }; - EC48D74C17F3148300DE80BF /* recruitment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = recruitment.hpp; path = recruitment/recruitment.hpp; sourceTree = ""; }; + EC48D74B17F3148300DE80BF /* recruitment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = recruitment.cpp; sourceTree = ""; }; + EC48D74C17F3148300DE80BF /* recruitment.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = recruitment.hpp; sourceTree = ""; }; EC49A38119F34F1200E78528 /* clipboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = clipboard.cpp; sourceTree = ""; }; EC4D40AD17FCCF14002E7C81 /* strftime.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strftime.cpp; sourceTree = ""; }; EC4D40AE17FCCF14002E7C81 /* strftime.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = strftime.hpp; sourceTree = ""; }; @@ -3418,12 +3418,14 @@ B52EE9A3121363EB00CFBDAB /* lua */ = { isa = PBXGroup; children = ( + 627F1ED9175AF35C000042E0 /* aspect_advancements.cpp */, + 627F1EDA175AF35C000042E0 /* aspect_advancements.hpp */, B52EE9A4121363EB00CFBDAB /* core.cpp */, B52EE9A5121363EB00CFBDAB /* core.hpp */, + B55BE03C11234AD700154E6C /* engine_lua.cpp */, + B55BE03D11234AD700154E6C /* engine_lua.hpp */, F46C5DD313A5089100DD0816 /* lua_object.cpp */, F46C5DD213A5089100DD0816 /* lua_object.hpp */, - 627F1ED9175AF35C000042E0 /* unit_advancements_aspect.cpp */, - 627F1EDA175AF35C000042E0 /* unit_advancements_aspect.hpp */, ); path = lua; sourceTree = ""; @@ -3460,12 +3462,6 @@ B54AC6A70FEA9EB5006F6FBD /* contexts.hpp */, B54AC6A80FEA9EB5006F6FBD /* engine.cpp */, B54AC6A90FEA9EB5006F6FBD /* engine.hpp */, - B54AC6AA0FEA9EB5006F6FBD /* engine_default.cpp */, - B54AC6AB0FEA9EB5006F6FBD /* engine_default.hpp */, - B508D191100146E300B12852 /* engine_fai.cpp */, - B508D192100146E300B12852 /* engine_fai.hpp */, - B55BE03C11234AD700154E6C /* engine_lua.cpp */, - B55BE03D11234AD700154E6C /* engine_lua.hpp */, B59F96D3103478C900A57C1A /* goal.cpp */, B59F96D4103478C900A57C1A /* goal.hpp */, B55BE03E11234AD700154E6C /* property_handler.hpp */, @@ -3481,9 +3477,19 @@ B54AC6B00FEA9EB5006F6FBD /* default */ = { isa = PBXGroup; children = ( + B59F96E51034791200A57C1A /* aspect_attacks.cpp */, + B59F96E61034791200A57C1A /* aspect_attacks.hpp */, B54AC6B30FEA9EB5006F6FBD /* attack.cpp */, + B54AC6C10FEA9EB5006F6FBD /* ca.cpp */, + B54AC6C20FEA9EB5006F6FBD /* ca.hpp */, B54AC6B40FEA9EB5006F6FBD /* contexts.cpp */, B54AC6B50FEA9EB5006F6FBD /* contexts.hpp */, + B54AC6AA0FEA9EB5006F6FBD /* engine_cpp.cpp */, + B54AC6AB0FEA9EB5006F6FBD /* engine_cpp.hpp */, + EC48D74B17F3148300DE80BF /* recruitment.cpp */, + EC48D74C17F3148300DE80BF /* recruitment.hpp */, + B54AC6C50FEA9EB5006F6FBD /* stage_rca.cpp */, + B54AC6C60FEA9EB5006F6FBD /* stage_rca.hpp */, ); path = default; sourceTree = ""; @@ -3497,6 +3503,8 @@ B5951A981013BB5A00C10B66 /* callable_objects.hpp */, B54AC6BE0FEA9EB5006F6FBD /* candidates.cpp */, B54AC6BF0FEA9EB5006F6FBD /* candidates.hpp */, + B508D191100146E300B12852 /* engine_fai.cpp */, + B508D192100146E300B12852 /* engine_fai.hpp */, B5951A991013BB5A00C10B66 /* function_table.cpp */, B5951A9A1013BB5A00C10B66 /* function_table.hpp */, B59F96DB103478DE00A57C1A /* stage_side_formulas.cpp */, @@ -3510,16 +3518,10 @@ B54AC6C00FEA9EB5006F6FBD /* testing */ = { isa = PBXGroup; children = ( - B59F96E51034791200A57C1A /* aspect_attacks.cpp */, - B59F96E61034791200A57C1A /* aspect_attacks.hpp */, B552D92A108694BB002D8F86 /* ca_testing_move_to_targets.cpp */, B552D92B108694BB002D8F86 /* ca_testing_move_to_targets.hpp */, B5CE46FB12A041CE00D665EE /* ca_testing_recruitment.cpp */, B5CE46FC12A041CE00D665EE /* ca_testing_recruitment.hpp */, - B54AC6C10FEA9EB5006F6FBD /* ca.cpp */, - B54AC6C20FEA9EB5006F6FBD /* ca.hpp */, - B54AC6C50FEA9EB5006F6FBD /* stage_rca.cpp */, - B54AC6C60FEA9EB5006F6FBD /* stage_rca.hpp */, EC4E3B1E19B2D8480049CBD7 /* stage_sf_with_rca.cpp */, EC4E3B1F19B2D8480049CBD7 /* stage_sf_with_rca.hpp */, ); @@ -3733,8 +3735,6 @@ B52EE9A3121363EB00CFBDAB /* lua */, B54AC6930FEA9E8F006F6FBD /* manager.cpp */, B54AC6940FEA9E8F006F6FBD /* manager.hpp */, - EC48D74B17F3148300DE80BF /* recruitment.cpp */, - EC48D74C17F3148300DE80BF /* recruitment.hpp */, B54AC6950FEA9E8F006F6FBD /* registry.cpp */, B54AC6960FEA9E8F006F6FBD /* registry.hpp */, EC4E3B2119B2D8880049CBD7 /* simulated_actions.cpp */, @@ -4427,7 +4427,7 @@ B5A9BD360ECA805A002BE442 /* resize_map.cpp in Sources */, F4728DB1145A59CF00F0E1E1 /* set_starting_position.cpp in Sources */, 62D24F2F1519982500350848 /* editor_toolkit.cpp in Sources */, - B54AC6DB0FEA9EB5006F6FBD /* engine_default.cpp in Sources */, + B54AC6DB0FEA9EB5006F6FBD /* engine_cpp.cpp in Sources */, B508D193100146E300B12852 /* engine_fai.cpp in Sources */, B55BE04011234AD700154E6C /* engine_lua.cpp in Sources */, B54AC6DA0FEA9EB5006F6FBD /* engine.cpp in Sources */, @@ -4787,7 +4787,7 @@ ECAA3FE718E0E4EF002E8998 /* unicode.cpp in Sources */, F4FBD76A145D93370083CA67 /* uninstall_list.cpp in Sources */, B5599AEF0EC62181008DD061 /* abilities.cpp in Sources */, - 627F1EDB175AF35C000042E0 /* unit_advancements_aspect.cpp in Sources */, + 627F1EDB175AF35C000042E0 /* aspect_advancements.cpp in Sources */, EC386CF1195119AA006004ED /* animation_component.cpp in Sources */, B5599AEE0EC62181008DD061 /* animation.cpp in Sources */, ECC2FFFC1A51A91100023AF4 /* attack_type.cpp in Sources */, @@ -4911,7 +4911,7 @@ B597C5640FACD6CA00CE81F5 /* new_map.cpp in Sources */, B561F392104B11F7001369F5 /* editor_preferences.cpp in Sources */, B597C5A80FACD6CA00CE81F5 /* resize_map.cpp in Sources */, - B54AC6CA0FEA9EB5006F6FBD /* engine_default.cpp in Sources */, + B54AC6CA0FEA9EB5006F6FBD /* engine_cpp.cpp in Sources */, B508D194100146E300B12852 /* engine_fai.cpp in Sources */, B55BE04111234AD700154E6C /* engine_lua.cpp in Sources */, B54AC6C90FEA9EB5006F6FBD /* engine.cpp in Sources */, diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f5c6852d7903..03797fe3a51c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -690,37 +690,37 @@ set(wesnoth-main_SRC ai/composite/component.cpp ai/composite/contexts.cpp ai/composite/engine.cpp - ai/composite/engine_default.cpp - ai/composite/engine_fai.cpp - ai/composite/engine_lua.cpp ai/composite/goal.cpp ai/composite/rca.cpp ai/composite/stage.cpp ai/configuration.cpp ai/contexts.cpp + ai/default/aspect_attacks.cpp ai/default/attack.cpp + ai/default/ca.cpp ai/default/contexts.cpp + ai/default/engine_cpp.cpp + ai/default/recruitment.cpp + ai/default/stage_rca.cpp ai/formula/ai.cpp ai/formula/callable_objects.cpp ai/formula/candidates.cpp + ai/formula/engine_fai.cpp ai/formula/function_table.cpp ai/formula/stage_side_formulas.cpp ai/formula/stage_unit_formulas.cpp ai/game_info.cpp ai/gamestate_observer.cpp ai/lua/core.cpp + ai/lua/engine_lua.cpp ai/lua/lua_object.cpp - ai/lua/unit_advancements_aspect.cpp + ai/lua/aspect_advancements.cpp ai/manager.cpp - ai/recruitment/recruitment.cpp ai/registry.cpp ai/simulated_actions.cpp ai/testing.cpp - ai/testing/aspect_attacks.cpp - ai/testing/ca.cpp ai/testing/ca_testing_move_to_targets.cpp ai/testing/ca_testing_recruitment.cpp - ai/testing/stage_rca.cpp ai/testing/stage_sf_with_rca.cpp animated_game.cpp attack_prediction.cpp diff --git a/src/SConscript b/src/SConscript index 44b6f3dd2cc4..f41a4990567f 100644 --- a/src/SConscript +++ b/src/SConscript @@ -215,37 +215,37 @@ wesnoth_sources = Split(""" ai/composite/component.cpp ai/composite/contexts.cpp ai/composite/engine.cpp - ai/composite/engine_default.cpp - ai/composite/engine_fai.cpp - ai/composite/engine_lua.cpp ai/composite/goal.cpp ai/composite/rca.cpp ai/composite/stage.cpp ai/configuration.cpp ai/contexts.cpp + ai/default/aspect_attacks.cpp ai/default/attack.cpp + ai/default/ca.cpp ai/default/contexts.cpp + ai/default/engine_cpp.cpp + ai/default/recruitment.cpp + ai/default/stage_rca.cpp ai/formula/ai.cpp ai/formula/callable_objects.cpp ai/formula/candidates.cpp + ai/formula/engine_fai.cpp ai/formula/function_table.cpp ai/formula/stage_side_formulas.cpp ai/formula/stage_unit_formulas.cpp ai/game_info.cpp ai/gamestate_observer.cpp ai/lua/core.cpp + ai/lua/engine_lua.cpp ai/lua/lua_object.cpp - ai/lua/unit_advancements_aspect.cpp + ai/lua/aspect_advancements.cpp ai/manager.cpp - ai/recruitment/recruitment.cpp ai/registry.cpp ai/simulated_actions.cpp ai/testing.cpp - ai/testing/aspect_attacks.cpp - ai/testing/ca.cpp ai/testing/ca_testing_move_to_targets.cpp ai/testing/ca_testing_recruitment.cpp - ai/testing/stage_rca.cpp ai/testing/stage_sf_with_rca.cpp animated_game.cpp attack_prediction.cpp diff --git a/src/actions/attack.cpp b/src/actions/attack.cpp index 8cb44506d0cc..1eb03322ad25 100644 --- a/src/actions/attack.cpp +++ b/src/actions/attack.cpp @@ -21,7 +21,7 @@ #include "vision.hpp" -#include "ai/lua/unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" #include "attack_prediction.hpp" #include "config_assign.hpp" #include "dialogs.hpp" diff --git a/src/actions/attack.hpp b/src/actions/attack.hpp index 8e0797f803ef..150263ca9ed3 100644 --- a/src/actions/attack.hpp +++ b/src/actions/attack.hpp @@ -30,7 +30,7 @@ class unit_map; class gamemap; #include "units/types.hpp" -#include "ai/lua/unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" #include diff --git a/src/ai/actions.cpp b/src/ai/actions.cpp index 064b753b836a..8b702ce91c72 100644 --- a/src/ai/actions.cpp +++ b/src/ai/actions.cpp @@ -32,9 +32,9 @@ * So far the use of 'subjective info' is stubbed out. */ -#include "actions.hpp" -#include "manager.hpp" -#include "simulated_actions.hpp" +#include "ai/actions.hpp" +#include "ai/manager.hpp" +#include "ai/simulated_actions.hpp" #include "actions/attack.hpp" #include "actions/create.hpp" diff --git a/src/ai/actions.hpp b/src/ai/actions.hpp index 7f9c8f01baa3..57e8885f22c8 100644 --- a/src/ai/actions.hpp +++ b/src/ai/actions.hpp @@ -20,10 +20,10 @@ #ifndef AI_ACTIONS_HPP_INCLUDED #define AI_ACTIONS_HPP_INCLUDED -#include "game_info.hpp" +#include "ai/game_info.hpp" #include "actions/move.hpp" -#include "lua/unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" #include "units/ptr.hpp" namespace pathfind { diff --git a/src/ai/composite/ai.cpp b/src/ai/composite/ai.cpp index 0ae2d5634e8e..2c94376fde12 100644 --- a/src/ai/composite/ai.cpp +++ b/src/ai/composite/ai.cpp @@ -18,12 +18,12 @@ * @file */ -#include "ai.hpp" -#include "aspect.hpp" -#include "engine.hpp" -#include "goal.hpp" -#include "property_handler.hpp" -#include "stage.hpp" +#include "ai/composite/ai.hpp" +#include "ai/composite/aspect.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/goal.hpp" +#include "ai/composite/property_handler.hpp" +#include "ai/composite/stage.hpp" #include "ai/configuration.hpp" #include "ai/manager.hpp" #include "actions/attack.hpp" diff --git a/src/ai/composite/ai.hpp b/src/ai/composite/ai.hpp index 0b84ab12ed75..fe9cab91f5f0 100644 --- a/src/ai/composite/ai.hpp +++ b/src/ai/composite/ai.hpp @@ -20,8 +20,8 @@ #ifndef AI_COMPOSITE_AI_HPP_INCLUDED #define AI_COMPOSITE_AI_HPP_INCLUDED -#include "contexts.hpp" -#include "component.hpp" +#include "ai/composite/contexts.hpp" +#include "ai/composite/component.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/composite/aspect.cpp b/src/ai/composite/aspect.cpp index 3e92c6f03706..1a9abba057fb 100644 --- a/src/ai/composite/aspect.cpp +++ b/src/ai/composite/aspect.cpp @@ -16,7 +16,7 @@ * @file */ -#include "aspect.hpp" +#include "ai/composite/aspect.hpp" #include "ai/manager.hpp" #include "log.hpp" diff --git a/src/ai/composite/aspect.hpp b/src/ai/composite/aspect.hpp index 05a7b6829642..17ccd155dbfa 100644 --- a/src/ai/composite/aspect.hpp +++ b/src/ai/composite/aspect.hpp @@ -19,8 +19,8 @@ #ifndef AI_COMPOSITE_ASPECT_HPP_INCLUDED #define AI_COMPOSITE_ASPECT_HPP_INCLUDED -#include "property_handler.hpp" -#include "value_translator.hpp" +#include "ai/composite/property_handler.hpp" +#include "ai/composite/value_translator.hpp" #include "ai/lua/lua_object.hpp" #include "ai/lua/core.hpp" #include "scripting/game_lua_kernel.hpp" diff --git a/src/ai/composite/component.cpp b/src/ai/composite/component.cpp index 3765744249a9..95695c7c967f 100644 --- a/src/ai/composite/component.cpp +++ b/src/ai/composite/component.cpp @@ -17,9 +17,9 @@ * @file */ -#include "component.hpp" -#include "engine.hpp" -#include "property_handler.hpp" +#include "ai/composite/component.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/property_handler.hpp" #include "config.hpp" #include "log.hpp" #include "units/unit.hpp" diff --git a/src/ai/composite/contexts.cpp b/src/ai/composite/contexts.cpp index 5fcfd80ec98f..5ab0fd097718 100644 --- a/src/ai/composite/contexts.cpp +++ b/src/ai/composite/contexts.cpp @@ -18,7 +18,7 @@ * @file */ -#include "contexts.hpp" +#include "ai/composite/contexts.hpp" // ======================================================================= namespace ai { diff --git a/src/ai/composite/goal.cpp b/src/ai/composite/goal.cpp index 555d0a8a0180..a1994f915757 100644 --- a/src/ai/composite/goal.cpp +++ b/src/ai/composite/goal.cpp @@ -17,7 +17,7 @@ * @file */ -#include "goal.hpp" +#include "ai/composite/goal.hpp" #include "global.hpp" #include "ai/default/contexts.hpp" diff --git a/src/ai/composite/goal.hpp b/src/ai/composite/goal.hpp index 65dcdb024906..0373188cc91a 100644 --- a/src/ai/composite/goal.hpp +++ b/src/ai/composite/goal.hpp @@ -26,7 +26,7 @@ #pragma warning(disable:4250) #endif -#include "component.hpp" +#include "ai/composite/component.hpp" #include "global.hpp" diff --git a/src/ai/composite/rca.cpp b/src/ai/composite/rca.cpp index 42324577480c..d525febea1d9 100644 --- a/src/ai/composite/rca.cpp +++ b/src/ai/composite/rca.cpp @@ -17,9 +17,9 @@ * @file */ -#include "ai.hpp" -#include "engine.hpp" -#include "rca.hpp" +#include "ai/composite/ai.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/rca.hpp" #include "log.hpp" namespace ai { diff --git a/src/ai/composite/rca.hpp b/src/ai/composite/rca.hpp index ce83bf53259b..892328b9e2ef 100644 --- a/src/ai/composite/rca.hpp +++ b/src/ai/composite/rca.hpp @@ -20,8 +20,8 @@ #ifndef AI_COMPOSITE_RCA_HPP_INCLUDED #define AI_COMPOSITE_RCA_HPP_INCLUDED -#include "component.hpp" -#include "contexts.hpp" +#include "ai/composite/component.hpp" +#include "ai/composite/contexts.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/composite/stage.cpp b/src/ai/composite/stage.cpp index ca582708e384..ca4a51be1998 100644 --- a/src/ai/composite/stage.cpp +++ b/src/ai/composite/stage.cpp @@ -17,9 +17,9 @@ * @file */ -#include "ai.hpp" -#include "engine.hpp" -#include "stage.hpp" +#include "ai/composite/ai.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/stage.hpp" #include "ai/contexts.hpp" #include "log.hpp" #include "resources.hpp" diff --git a/src/ai/composite/stage.hpp b/src/ai/composite/stage.hpp index c832eeb4f5ed..d88b9270a4aa 100644 --- a/src/ai/composite/stage.hpp +++ b/src/ai/composite/stage.hpp @@ -20,8 +20,8 @@ #ifndef AI_COMPOSITE_STAGE_HPP_INCLUDED #define AI_COMPOSITE_STAGE_HPP_INCLUDED -#include "component.hpp" -#include "contexts.hpp" +#include "ai/composite/component.hpp" +#include "ai/composite/contexts.hpp" #ifdef _MSC_VER #pragma warning(push) diff --git a/src/ai/composite/value_translator.hpp b/src/ai/composite/value_translator.hpp index b58ca5811528..b0b2090cede0 100644 --- a/src/ai/composite/value_translator.hpp +++ b/src/ai/composite/value_translator.hpp @@ -19,15 +19,15 @@ #ifndef VALUE_TRANSLATOR_HPP_INCLUDED #define VALUE_TRANSLATOR_HPP_INCLUDED -#include "engine.hpp" -#include "stage.hpp" +#include "ai/composite/engine.hpp" +#include "ai/composite/stage.hpp" #include "ai/manager.hpp" #include "terrain/filter.hpp" #include "util.hpp" #include "serialization/string_utils.hpp" #include "resources.hpp" -#include "ai/lua/unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" namespace ai { diff --git a/src/ai/configuration.cpp b/src/ai/configuration.cpp index 5e2687c0f631..8d22dd78af47 100644 --- a/src/ai/configuration.cpp +++ b/src/ai/configuration.cpp @@ -18,7 +18,7 @@ * @file */ -#include "configuration.hpp" +#include "ai/configuration.hpp" #include "filesystem.hpp" #include "log.hpp" diff --git a/src/ai/configuration.hpp b/src/ai/configuration.hpp index 71c172723ff1..7ab395df21a3 100644 --- a/src/ai/configuration.hpp +++ b/src/ai/configuration.hpp @@ -21,7 +21,7 @@ #define AI_CONFIGURATION_HPP_INCLUDED #include "config.hpp" -#include "game_info.hpp" +#include "ai/game_info.hpp" namespace ai { diff --git a/src/ai/contexts.cpp b/src/ai/contexts.cpp index 032157d4d85c..fdc403dacc0e 100644 --- a/src/ai/contexts.cpp +++ b/src/ai/contexts.cpp @@ -30,7 +30,7 @@ #include "ai/composite/goal.hpp" // for goal #include "ai/composite/stage.hpp" // for ministage #include "ai/game_info.hpp" // for aspect_type<>::typesafe_ptr, etc -#include "ai/lua/unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" #include "ai/manager.hpp" // for manager #include "chat_events.hpp" // for chat_handler, etc diff --git a/src/ai/testing/aspect_attacks.cpp b/src/ai/default/aspect_attacks.cpp similarity index 99% rename from src/ai/testing/aspect_attacks.cpp rename to src/ai/default/aspect_attacks.cpp index dd8840e0a20a..91bbaf8afa41 100644 --- a/src/ai/testing/aspect_attacks.cpp +++ b/src/ai/default/aspect_attacks.cpp @@ -17,7 +17,7 @@ * @file */ -#include "aspect_attacks.hpp" +#include "ai/default/aspect_attacks.hpp" #include "ai/manager.hpp" #include "actions/attack.hpp" @@ -33,7 +33,7 @@ namespace ai { -namespace testing_ai_default { +namespace ai_default_rca { static lg::log_domain log_ai_testing_aspect_attacks("ai/aspect/attacks"); #define DBG_AI LOG_STREAM(debug, log_ai_testing_aspect_attacks) diff --git a/src/ai/testing/aspect_attacks.hpp b/src/ai/default/aspect_attacks.hpp similarity index 98% rename from src/ai/testing/aspect_attacks.hpp rename to src/ai/default/aspect_attacks.hpp index b1791f978ac7..c0507566627e 100644 --- a/src/ai/testing/aspect_attacks.hpp +++ b/src/ai/default/aspect_attacks.hpp @@ -31,7 +31,7 @@ namespace ai { -namespace testing_ai_default { +namespace ai_default_rca { class aspect_attacks: public typesafe_aspect { public: diff --git a/src/ai/default/attack.cpp b/src/ai/default/attack.cpp index ecd840da1808..d7b4b46ee7f8 100644 --- a/src/ai/default/attack.cpp +++ b/src/ai/default/attack.cpp @@ -20,6 +20,7 @@ #include "global.hpp" #include "ai/manager.hpp" +#include "ai/default/contexts.hpp" #include "actions/attack.hpp" #include "attack_prediction.hpp" diff --git a/src/ai/testing/ca.cpp b/src/ai/default/ca.cpp similarity index 99% rename from src/ai/testing/ca.cpp rename to src/ai/default/ca.cpp index c7cf285f3510..e6c29fed651a 100644 --- a/src/ai/testing/ca.cpp +++ b/src/ai/default/ca.cpp @@ -17,7 +17,7 @@ * @file */ -#include "ca.hpp" +#include "ai/default/ca.hpp" #include "ai/actions.hpp" #include "ai/manager.hpp" #include "ai/composite/engine.hpp" @@ -49,7 +49,7 @@ static lg::log_domain log_ai_testing_ai_default("ai/ca/testing_ai_default"); namespace ai { -namespace testing_ai_default { +namespace ai_default_rca { //============================================================== diff --git a/src/ai/testing/ca.hpp b/src/ai/default/ca.hpp similarity index 99% rename from src/ai/testing/ca.hpp rename to src/ai/default/ca.hpp index 22e5b0caf048..c7efc2dd0485 100644 --- a/src/ai/testing/ca.hpp +++ b/src/ai/default/ca.hpp @@ -34,7 +34,7 @@ namespace ai { -namespace testing_ai_default { +namespace ai_default_rca { //============================================================================ diff --git a/src/ai/default/contexts.cpp b/src/ai/default/contexts.cpp index 0c23d3588ec4..4098fddacb0c 100644 --- a/src/ai/default/contexts.cpp +++ b/src/ai/default/contexts.cpp @@ -18,7 +18,7 @@ * @file */ -#include "contexts.hpp" +#include "ai/default/contexts.hpp" #include "game_board.hpp" #include "log.hpp" diff --git a/src/ai/composite/engine_default.cpp b/src/ai/default/engine_cpp.cpp similarity index 96% rename from src/ai/composite/engine_default.cpp rename to src/ai/default/engine_cpp.cpp index 23bf4c9add0a..8c4345b25b94 100644 --- a/src/ai/composite/engine_default.cpp +++ b/src/ai/default/engine_cpp.cpp @@ -17,12 +17,12 @@ * @file */ -#include "ai.hpp" -#include "aspect.hpp" -#include "goal.hpp" -#include "engine_default.hpp" -#include "rca.hpp" -#include "stage.hpp" +#include "ai/composite/ai.hpp" +#include "ai/composite/aspect.hpp" +#include "ai/composite/goal.hpp" +#include "ai/composite/rca.hpp" +#include "ai/composite/stage.hpp" +#include "ai/default/engine_cpp.hpp" #include "log.hpp" namespace ai { diff --git a/src/ai/composite/engine_default.hpp b/src/ai/default/engine_cpp.hpp similarity index 100% rename from src/ai/composite/engine_default.hpp rename to src/ai/default/engine_cpp.hpp diff --git a/src/ai/recruitment/recruitment.cpp b/src/ai/default/recruitment.cpp similarity index 99% rename from src/ai/recruitment/recruitment.cpp rename to src/ai/default/recruitment.cpp index 3a1a8e565565..0a8781e8442c 100644 --- a/src/ai/recruitment/recruitment.cpp +++ b/src/ai/default/recruitment.cpp @@ -18,7 +18,7 @@ * See http://wiki.wesnoth.org/AI_Recruitment */ -#include "recruitment.hpp" +#include "ai/default/recruitment.hpp" #include "ai/actions.hpp" #include "ai/composite/rca.hpp" diff --git a/src/ai/recruitment/recruitment.hpp b/src/ai/default/recruitment.hpp similarity index 100% rename from src/ai/recruitment/recruitment.hpp rename to src/ai/default/recruitment.hpp diff --git a/src/ai/testing/stage_rca.cpp b/src/ai/default/stage_rca.cpp similarity index 97% rename from src/ai/testing/stage_rca.cpp rename to src/ai/default/stage_rca.cpp index 28a2fbbea286..7fdc45f0b437 100644 --- a/src/ai/testing/stage_rca.cpp +++ b/src/ai/default/stage_rca.cpp @@ -17,7 +17,7 @@ * @file */ -#include "stage_rca.hpp" +#include "ai/default/stage_rca.hpp" #include "ai/manager.hpp" #include "ai/composite/ai.hpp" @@ -32,7 +32,7 @@ namespace ai { -namespace testing_ai_default { +namespace ai_default_rca { static lg::log_domain log_ai_testing_rca_default("ai/stage/rca"); #define DBG_AI_TESTING_RCA_DEFAULT LOG_STREAM(debug, log_ai_testing_rca_default) @@ -54,7 +54,7 @@ void candidate_action_evaluation_loop::on_create() } boost::function2&, const config&> factory_candidate_actions = - boost::bind(&testing_ai_default::candidate_action_evaluation_loop::create_candidate_action,*this,_1,_2); + boost::bind(&candidate_action_evaluation_loop::create_candidate_action,*this,_1,_2); register_vector_property(property_handlers(),"candidate_action",candidate_actions_, factory_candidate_actions); diff --git a/src/ai/testing/stage_rca.hpp b/src/ai/default/stage_rca.hpp similarity index 98% rename from src/ai/testing/stage_rca.hpp rename to src/ai/default/stage_rca.hpp index 35dd24bab861..e785b251aebd 100644 --- a/src/ai/testing/stage_rca.hpp +++ b/src/ai/default/stage_rca.hpp @@ -31,7 +31,7 @@ namespace ai { -namespace testing_ai_default { +namespace ai_default_rca { class candidate_action_evaluation_loop: public virtual stage, public virtual rca_context { public: diff --git a/src/ai/formula/ai.cpp b/src/ai/formula/ai.cpp index a13bab6de65c..ecf7dd2efa5b 100644 --- a/src/ai/formula/ai.cpp +++ b/src/ai/formula/ai.cpp @@ -17,10 +17,10 @@ * Defines formula ai candidate actions - headers */ -#include "ai.hpp" +#include "ai/formula/ai.hpp" #include "global.hpp" -#include "callable_objects.hpp" // for unit_callable, etc +#include "ai/formula/callable_objects.hpp" // for unit_callable, etc #include "chat_events.hpp" // for chat_handler, etc #include "display_chat_manager.hpp" #include "formula/function.hpp" // for formula_expression diff --git a/src/ai/formula/ai.hpp b/src/ai/formula/ai.hpp index 844df64f2796..b308e24dba55 100644 --- a/src/ai/formula/ai.hpp +++ b/src/ai/formula/ai.hpp @@ -23,7 +23,7 @@ #include "ai/contexts.hpp" #include "ai/formula/function_table.hpp" // for ai_function_symbol_table -#include "callable_objects.hpp" // for position_callable, etc +#include "ai/formula/callable_objects.hpp" // for position_callable, etc #include "candidates.hpp" // for candidate_action_ptr, etc #include "config.hpp" // for config #include "formula/callable.hpp" // for formula_callable, etc diff --git a/src/ai/formula/callable_objects.cpp b/src/ai/formula/callable_objects.cpp index 85e809477ecc..15a031153a17 100644 --- a/src/ai/formula/callable_objects.cpp +++ b/src/ai/formula/callable_objects.cpp @@ -12,10 +12,10 @@ See the COPYING file for more details. */ -#include "ai.hpp" +#include "ai/formula/ai.hpp" #include "attack_prediction.hpp" #include "game_board.hpp" -#include "callable_objects.hpp" +#include "ai/formula/callable_objects.hpp" #include "resources.hpp" diff --git a/src/ai/formula/candidates.cpp b/src/ai/formula/candidates.cpp index ec1e52d5daa0..996073b4a644 100644 --- a/src/ai/formula/candidates.cpp +++ b/src/ai/formula/candidates.cpp @@ -17,8 +17,8 @@ * Defines formula ai candidate actions * */ -#include "ai.hpp" -#include "candidates.hpp" +#include "ai/formula/ai.hpp" +#include "ai/formula/candidates.hpp" #include "log.hpp" #include "resources.hpp" diff --git a/src/ai/composite/engine_fai.cpp b/src/ai/formula/engine_fai.cpp similarity index 100% rename from src/ai/composite/engine_fai.cpp rename to src/ai/formula/engine_fai.cpp diff --git a/src/ai/composite/engine_fai.hpp b/src/ai/formula/engine_fai.hpp similarity index 100% rename from src/ai/composite/engine_fai.hpp rename to src/ai/formula/engine_fai.hpp diff --git a/src/ai/formula/function_table.cpp b/src/ai/formula/function_table.cpp index 6c0e059971f1..fef3bd3badad 100644 --- a/src/ai/formula/function_table.cpp +++ b/src/ai/formula/function_table.cpp @@ -18,9 +18,9 @@ #include #include -#include "ai.hpp" -#include "callable_objects.hpp" -#include "function_table.hpp" +#include "ai/formula/ai.hpp" +#include "ai/formula/callable_objects.hpp" +#include "ai/formula/function_table.hpp" #include "ai/default/contexts.hpp" diff --git a/src/ai/formula/stage_side_formulas.cpp b/src/ai/formula/stage_side_formulas.cpp index 33ef964d3f61..724fd0bc9a8f 100644 --- a/src/ai/formula/stage_side_formulas.cpp +++ b/src/ai/formula/stage_side_formulas.cpp @@ -18,8 +18,8 @@ */ -#include "stage_side_formulas.hpp" -#include "ai.hpp" +#include "ai/formula/stage_side_formulas.hpp" +#include "ai/formula/ai.hpp" #include "formula/formula.hpp" #include "formula/function.hpp" diff --git a/src/ai/formula/stage_unit_formulas.cpp b/src/ai/formula/stage_unit_formulas.cpp index d8f58e45fe56..0c875a1d64cd 100644 --- a/src/ai/formula/stage_unit_formulas.cpp +++ b/src/ai/formula/stage_unit_formulas.cpp @@ -18,8 +18,8 @@ * */ -#include "stage_unit_formulas.hpp" -#include "ai.hpp" +#include "ai/formula/stage_unit_formulas.hpp" +#include "ai/formula/ai.hpp" #include "formula/formula.hpp" #include "formula/function.hpp" diff --git a/src/ai/game_info.cpp b/src/ai/game_info.cpp index 23e122961180..70a142b77790 100644 --- a/src/ai/game_info.cpp +++ b/src/ai/game_info.cpp @@ -17,7 +17,7 @@ * @file */ -#include "game_info.hpp" +#include "ai/game_info.hpp" namespace ai { // ======================================================================= diff --git a/src/ai/gamestate_observer.cpp b/src/ai/gamestate_observer.cpp index 22fa4342b966..9139d937e93c 100644 --- a/src/ai/gamestate_observer.cpp +++ b/src/ai/gamestate_observer.cpp @@ -18,8 +18,8 @@ * @file */ -#include "manager.hpp" -#include "gamestate_observer.hpp" +#include "ai/manager.hpp" +#include "ai/gamestate_observer.hpp" namespace ai { // ======================================================================= diff --git a/src/ai/lua/unit_advancements_aspect.cpp b/src/ai/lua/aspect_advancements.cpp similarity index 98% rename from src/ai/lua/unit_advancements_aspect.cpp rename to src/ai/lua/aspect_advancements.cpp index ab5289fcc9db..54355c351038 100644 --- a/src/ai/lua/unit_advancements_aspect.cpp +++ b/src/ai/lua/aspect_advancements.cpp @@ -12,7 +12,7 @@ See the COPYING file for more details. */ -#include "unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" #include "global.hpp" #include "log.hpp" // for LOG_STREAM, logger, etc diff --git a/src/ai/lua/unit_advancements_aspect.hpp b/src/ai/lua/aspect_advancements.hpp similarity index 100% rename from src/ai/lua/unit_advancements_aspect.hpp rename to src/ai/lua/aspect_advancements.hpp diff --git a/src/ai/lua/core.cpp b/src/ai/lua/core.cpp index 766f15003a9f..99cd714dfa6c 100644 --- a/src/ai/lua/core.cpp +++ b/src/ai/lua/core.cpp @@ -21,7 +21,7 @@ #include #include -#include "core.hpp" +#include "ai/lua/core.hpp" #include "ai/composite/aspect.hpp" #include "scripting/game_lua_kernel.hpp" #include "scripting/lua_api.hpp" @@ -39,7 +39,7 @@ #include "terrain/filter.hpp" #include "units/unit.hpp" #include "ai/actions.hpp" -#include "ai/composite/engine_lua.hpp" +#include "ai/lua/engine_lua.hpp" #include "ai/composite/contexts.hpp" #include "lua/lualib.h" diff --git a/src/ai/composite/engine_lua.cpp b/src/ai/lua/engine_lua.cpp similarity index 100% rename from src/ai/composite/engine_lua.cpp rename to src/ai/lua/engine_lua.cpp diff --git a/src/ai/composite/engine_lua.hpp b/src/ai/lua/engine_lua.hpp similarity index 100% rename from src/ai/composite/engine_lua.hpp rename to src/ai/lua/engine_lua.hpp diff --git a/src/ai/lua/lua_object.hpp b/src/ai/lua/lua_object.hpp index 08efcffa58e1..ab994a85d653 100644 --- a/src/ai/lua/lua_object.hpp +++ b/src/ai/lua/lua_object.hpp @@ -30,7 +30,7 @@ #include "terrain/filter.hpp" #include "variable.hpp" #include "ai/default/contexts.hpp" -#include "unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" #include #include diff --git a/src/ai/manager.cpp b/src/ai/manager.cpp index 39d318aff479..32b5a3c82d0a 100644 --- a/src/ai/manager.cpp +++ b/src/ai/manager.cpp @@ -17,7 +17,7 @@ * @file */ -#include "manager.hpp" +#include "ai/manager.hpp" #include "config.hpp" // for config, etc #include "game_events/manager.hpp" @@ -29,18 +29,18 @@ #include "serialization/string_utils.hpp" #include "tod_manager.hpp" -#include "composite/ai.hpp" // for ai_composite -#include "composite/component.hpp" // for component_manager -#include "composite/engine.hpp" // for engine -#include "configuration.hpp" // for configuration -#include "contexts.hpp" // for readonly_context, etc -#include "default/contexts.hpp" // for default_ai_context, etc +#include "ai/composite/ai.hpp" // for ai_composite +#include "ai/composite/component.hpp" // for component_manager +#include "ai/composite/engine.hpp" // for engine +#include "ai/configuration.hpp" // for configuration +#include "ai/contexts.hpp" // for readonly_context, etc +#include "ai/default/contexts.hpp" // for default_ai_context, etc #include "game_end_exceptions.hpp" // for ai_end_turn_exception #include "game_info.hpp" // for side_number, engine_ptr, etc #include "game_config.hpp" // for debug #include "game_errors.hpp" // for game_error -#include "lua/unit_advancements_aspect.hpp" -#include "registry.hpp" // for init +#include "ai/lua/aspect_advancements.hpp" +#include "ai/registry.hpp" // for init #include "util.hpp" // for lexical_cast diff --git a/src/ai/manager.hpp b/src/ai/manager.hpp index e8f1cb237c1d..72757870aebb 100644 --- a/src/ai/manager.hpp +++ b/src/ai/manager.hpp @@ -24,7 +24,7 @@ #include "config.hpp" // for config, etc #include "global.hpp" -#include "game_info.hpp" // for side_number, ai_ptr +#include "ai/game_info.hpp" // for side_number, ai_ptr #include // for shared_ptr #include // for deque diff --git a/src/ai/registry.cpp b/src/ai/registry.cpp index 56acbb12ccc8..b949f236a426 100644 --- a/src/ai/registry.cpp +++ b/src/ai/registry.cpp @@ -17,7 +17,7 @@ * @file */ -#include "registry.hpp" +#include "ai/registry.hpp" #include "global.hpp" #include "config.hpp" // for config, operator<< @@ -26,20 +26,20 @@ #include "ai/composite/stage.hpp" // for ministage, idle_stage, etc #include "ai/composite/rca.hpp" #include "ai/game_info.hpp" // for attacks_vector -#include "composite/ai.hpp" // for ai_composite -#include "composite/aspect.hpp" // for composite_aspect, etc -#include "composite/engine_default.hpp" // for engine_cpp -#include "composite/engine_fai.hpp" // for engine_fai -#include "composite/engine_lua.hpp" // for engine_lua -#include "composite/goal.hpp" // for register_goal_factory, etc -#include "lua/unit_advancements_aspect.hpp" -#include "recruitment/recruitment.hpp" // for recruitment -#include "testing/aspect_attacks.hpp" // for aspect_attacks -#include "testing/ca.hpp" // for leader_shares_keep_phase, etc -#include "testing/ca_testing_move_to_targets.hpp" -#include "testing/ca_testing_recruitment.hpp" -#include "testing/stage_sf_with_rca.hpp" -#include "testing/stage_rca.hpp" +#include "ai/composite/ai.hpp" // for ai_composite +#include "ai/composite/aspect.hpp" // for composite_aspect, etc +#include "ai/default/engine_cpp.hpp" // for engine_cpp +#include "ai/formula/engine_fai.hpp" // for engine_fai +#include "ai/lua/engine_lua.hpp" // for engine_lua +#include "ai/composite/goal.hpp" // for register_goal_factory, etc +#include "ai/lua/aspect_advancements.hpp" +#include "ai/default/recruitment.hpp" // for recruitment +#include "ai/default/aspect_attacks.hpp" // for aspect_attacks +#include "ai/default/ca.hpp" // for leader_shares_keep_phase, etc +#include "ai/testing/ca_testing_move_to_targets.hpp" +#include "ai/testing/ca_testing_recruitment.hpp" +#include "ai/testing/stage_sf_with_rca.hpp" +#include "ai/default/stage_rca.hpp" #include // for shared_ptr, etc #include // for string @@ -64,7 +64,7 @@ static register_engine_factory // Stages // ======================================================================= -static register_stage_factory +static register_stage_factory candidate_action_evaluation_loop_factory("ai_default_rca::candidate_action_evaluation_loop"); static register_stage_factory @@ -74,79 +74,79 @@ static register_stage_factory ai_idle_stage_factory("empty"); // === Also keep the old syntax === -static register_stage_factory +static register_stage_factory old_candidate_action_evaluation_loop_factory("testing_ai_default::candidate_action_evaluation_loop"); // ======================================================================= // Candidate actions // ======================================================================= -static register_candidate_action_factory +static register_candidate_action_factory goto_phase_factory("ai_default_rca::goto_phase"); -static register_candidate_action_factory +static register_candidate_action_factory combat_phase_factory("ai_default_rca::combat_phase"); -static register_candidate_action_factory +static register_candidate_action_factory move_leader_to_goals_phase_factory("ai_default_rca::move_leader_to_goals_phase"); -static register_candidate_action_factory +static register_candidate_action_factory move_leader_to_keep_phase_factory("ai_default_rca::move_leader_to_keep_phase"); -static register_candidate_action_factory +static register_candidate_action_factory get_villages_phase_factory("ai_default_rca::get_villages_phase"); -static register_candidate_action_factory +static register_candidate_action_factory get_healing_phase_factory("ai_default_rca::get_healing_phase"); -static register_candidate_action_factory +static register_candidate_action_factory retreat_phase_factory("ai_default_rca::retreat_phase"); -static register_candidate_action_factory +static register_candidate_action_factory simple_move_and_targeting_phase_factory("ai_default_rca::simple_move_and_targeting_phase"); static register_candidate_action_factory default_move_to_targets_phase_factory("ai_default_rca::move_to_targets_phase"); -static register_candidate_action_factory +static register_candidate_action_factory leader_control_phase_factory("ai_default_rca::leader_control_phase"); static register_candidate_action_factory testing_recruitment_phase_factory("ai_default_rca::testing_recruitment_phase"); -static register_candidate_action_factory +static register_candidate_action_factory leader_shares_keep_phase_factory("ai_default_rca::leader_shares_keep_phase"); //Also keep passive_leader_shares_keep_phase for backward compatibility -static register_candidate_action_factory +static register_candidate_action_factory passive_leader_shares_keep_phase_factory("ai_default_rca::passive_leader_shares_keep_phase"); static register_candidate_action_factory default_recruitment_factory("default_recruitment::recruitment"); // === Also keep the old syntax === -static register_candidate_action_factory +static register_candidate_action_factory old_goto_phase_factory("testing_ai_default::goto_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_combat_phase_factory("testing_ai_default::combat_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_move_leader_to_goals_phase_factory("testing_ai_default::move_leader_to_goals_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_move_leader_to_keep_phase_factory("testing_ai_default::move_leader_to_keep_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_get_villages_phase_factory("testing_ai_default::get_villages_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_get_healing_phase_factory("testing_ai_default::get_healing_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_retreat_phase_factory("testing_ai_default::retreat_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_simple_move_and_targeting_phase_factory("testing_ai_default::simple_move_and_targeting_phase"); static register_candidate_action_factory @@ -155,13 +155,13 @@ static register_candidate_action_factory old_testing_move_to_targets_phase_factory("testing_ai_default::testing_move_to_targets_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_leader_control_phase_factory("testing_ai_default::leader_control_phase"); static register_candidate_action_factory old_testing_recruitment_phase_factory("testing_ai_default::testing_recruitment_phase"); -static register_candidate_action_factory +static register_candidate_action_factory old_passive_leader_shares_keep_phase_factory("testing_ai_default::passive_leader_shares_keep_phase"); // ======================================================================= @@ -284,7 +284,7 @@ static register_aspect_factory< standard_aspect > static register_aspect_factory< standard_aspect > attack_depth__standard_aspect_factory("attack_depth*standard_aspect"); -static register_aspect_factory< testing_ai_default::aspect_attacks > +static register_aspect_factory< ai_default_rca::aspect_attacks > attacks__testing_ai_default_aspect_attacks_factory("attacks*ai_default_rca::aspect_attacks"); static register_aspect_factory< standard_aspect< terrain_filter > > @@ -349,7 +349,7 @@ static register_aspect_factory< standard_aspect > // Also keep the old syntax -static register_aspect_factory< testing_ai_default::aspect_attacks > +static register_aspect_factory< ai_default_rca::aspect_attacks > old_attacks__testing_ai_default_aspect_attacks_factory("attacks*testing_ai_default::aspect_attacks"); //name = default @@ -362,7 +362,7 @@ static register_aspect_factory< standard_aspect > static register_aspect_factory< standard_aspect > attack_depth__standard_aspect_factory2("attack_depth*"); -static register_aspect_factory< testing_ai_default::aspect_attacks > +static register_aspect_factory< ai_default_rca::aspect_attacks > attacks__testing_ai_default_aspect_attacks_factory2("attacks*"); static register_aspect_factory< standard_aspect< terrain_filter > > @@ -485,7 +485,7 @@ static register_lua_aspect_factory< lua_aspect< std::vector > > // Some compatibility - recruitment is a removed aspect, but its syntax // is compatible with recruitment_instructions static register_aspect_factory< composite_aspect > - recruitments__composit_aspect_factory("recruitment*composite_aspect"); + recruitments__composite_aspect_factory("recruitment*composite_aspect"); static register_aspect_factory< default_recruitment::recruitment_aspect > recruitment__standard_aspect_factory("recruitment*standard_aspect"); diff --git a/src/ai/simulated_actions.cpp b/src/ai/simulated_actions.cpp index 521bc71306af..e725c2f11f9a 100644 --- a/src/ai/simulated_actions.cpp +++ b/src/ai/simulated_actions.cpp @@ -17,7 +17,7 @@ * @file */ -#include "simulated_actions.hpp" +#include "ai/simulated_actions.hpp" #include "game_board.hpp" #include "game_config.hpp" diff --git a/src/ai/simulated_actions.hpp b/src/ai/simulated_actions.hpp index 62f64495e4ee..133047739f64 100644 --- a/src/ai/simulated_actions.hpp +++ b/src/ai/simulated_actions.hpp @@ -20,9 +20,9 @@ #ifndef AI_SIMULATED_ACTIONS_HPP_INCLUDED #define AI_SIMULATED_ACTIONS_HPP_INCLUDED -#include "game_info.hpp" +#include "ai/game_info.hpp" -#include "lua/unit_advancements_aspect.hpp" +#include "lua/aspect_advancements.hpp" class unit_type; diff --git a/src/ai/testing.cpp b/src/ai/testing.cpp index 6cb58adfa32b..703830752765 100644 --- a/src/ai/testing.cpp +++ b/src/ai/testing.cpp @@ -16,8 +16,8 @@ * Gather statistics important for AI testing and output them * @file */ -#include "manager.hpp" -#include "testing.hpp" +#include "ai/manager.hpp" +#include "ai/testing.hpp" #include "log.hpp" #include "game_board.hpp" #include "replay.hpp" diff --git a/src/ai/testing/ca_testing_move_to_targets.cpp b/src/ai/testing/ca_testing_move_to_targets.cpp index 762f6af2ddd4..0ead444e8e53 100644 --- a/src/ai/testing/ca_testing_move_to_targets.cpp +++ b/src/ai/testing/ca_testing_move_to_targets.cpp @@ -17,7 +17,7 @@ * Strategic movement routine, taken from default AI */ -#include "ca_testing_move_to_targets.hpp" +#include "ai/testing/ca_testing_move_to_targets.hpp" #include "ai/composite/ai.hpp" #include "ai/actions.hpp" diff --git a/src/ai/testing/ca_testing_recruitment.cpp b/src/ai/testing/ca_testing_recruitment.cpp index 3278b1888f49..85773339c686 100644 --- a/src/ai/testing/ca_testing_recruitment.cpp +++ b/src/ai/testing/ca_testing_recruitment.cpp @@ -17,7 +17,7 @@ * Experimental recruitment phase by Floris Kint */ -#include "ca_testing_recruitment.hpp" +#include "ai/testing/ca_testing_recruitment.hpp" #include "ai/actions.hpp" #include "ai/manager.hpp" #include "ai/composite/engine.hpp" diff --git a/src/ai/testing/stage_sf_with_rca.cpp b/src/ai/testing/stage_sf_with_rca.cpp index ca4bb143f94d..dab791971a5f 100644 --- a/src/ai/testing/stage_sf_with_rca.cpp +++ b/src/ai/testing/stage_sf_with_rca.cpp @@ -18,7 +18,7 @@ * See http://wiki.wesnoth.org/AI_sfrca */ -#include "stage_sf_with_rca.hpp" +#include "ai/testing/stage_sf_with_rca.hpp" #include "ai/manager.hpp" #include "ai/composite/ai.hpp" @@ -48,6 +48,8 @@ static lg::log_domain log_ai_testing_sf_with_rca("ai/stage/sf_with_rca"); #define LOG_AI_TESTING_SF_WITH_RCA LOG_STREAM(info, log_ai_testing_sf_with_rca) #define ERR_AI_TESTING_SF_WITH_RCA LOG_STREAM(err, log_ai_testing_sf_with_rca) +using ai_default_rca::candidate_action_evaluation_loop; + strategy_formulation_with_rca::strategy_formulation_with_rca(ai_context &context, const config &cfg) : stage(context,cfg) , rca_(boost::shared_ptr(new candidate_action_evaluation_loop(context, cfg))) diff --git a/src/ai/testing/stage_sf_with_rca.hpp b/src/ai/testing/stage_sf_with_rca.hpp index ba65bf661cb3..85cd6089578d 100644 --- a/src/ai/testing/stage_sf_with_rca.hpp +++ b/src/ai/testing/stage_sf_with_rca.hpp @@ -21,7 +21,7 @@ #ifndef AI_TESTING_STAGE_SF_WITH_RCA_HPP_INCLUDED #define AI_TESTING_STAGE_SF_WITH_RCA_HPP_INCLUDED -#include "stage_rca.hpp" +#include "ai/default/stage_rca.hpp" #include "ai/composite/stage.hpp" #include "units/map.hpp" @@ -130,7 +130,7 @@ class strategy_formulation_with_rca: public virtual stage, public virtual rca_co std::vector enemy_this_turn_; // Store if is enemy for this turn. Use in the set optimal strategy function. - boost::shared_ptr rca_; + boost::shared_ptr rca_; }; } // of namespace testing_ai_default diff --git a/src/dialogs.cpp b/src/dialogs.cpp index 9c0636bccad7..96d0a1874494 100644 --- a/src/dialogs.cpp +++ b/src/dialogs.cpp @@ -59,7 +59,7 @@ #include "formula/string_utils.hpp" #include "gui/dialogs/game_save.hpp" #include "gui/dialogs/transient_message.hpp" -#include "ai/lua/unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" #include #include diff --git a/src/dialogs.hpp b/src/dialogs.hpp index 3c48c716af75..7c1a31dd5804 100644 --- a/src/dialogs.hpp +++ b/src/dialogs.hpp @@ -27,7 +27,7 @@ class terrain_type; #include "construct_dialog.hpp" #include "network.hpp" #include "units/ptr.hpp" -#include "ai/lua/unit_advancements_aspect.hpp" +#include "ai/lua/aspect_advancements.hpp" namespace dialogs { diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp index 9d09577e9cd0..54f0c39be355 100644 --- a/src/scripting/game_lua_kernel.cpp +++ b/src/scripting/game_lua_kernel.cpp @@ -33,7 +33,7 @@ #include "ai/composite/ai.hpp" // for ai_composite #include "ai/composite/component.hpp" // for component, etc #include "ai/composite/contexts.hpp" // for ai_context -#include "ai/composite/engine_lua.hpp" // for engine_lua +#include "ai/lua/engine_lua.hpp" // for engine_lua #include "ai/composite/rca.hpp" // for candidate_action #include "ai/composite/stage.hpp" // for stage #include "ai/configuration.hpp" // for configuration