0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file renames in src/ai

Browse source
This commit is contained in:
Iurii Chernyi 2009-06-09 13:00:46 +00:00
parent 5354149d67
commit fff0d9b9f9
39 changed files with 310 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
projectfiles/CodeBlocks-SCons/wesnoth.cbp
View file

@ -45,22 +45,9 @@
<Unit filename="..\..\src\addon_checks.hpp" />
<Unit filename="..\..\src\addon_management.cpp" />
<Unit filename="..\..\src\addon_management.hpp" />
<Unit filename="..\..\src\ai\ai.cpp" />
<Unit filename="..\..\src\ai\ai.hpp" />
<Unit filename="..\..\src\ai\ai2.hpp" />
<Unit filename="..\..\src\ai\ai_actions.cpp" />
<Unit filename="..\..\src\ai\ai_actions.hpp" />
<Unit filename="..\..\src\ai\ai_attack.cpp" />
<Unit filename="..\..\src\ai\ai_configuration.cpp" />
<Unit filename="..\..\src\ai\ai_configuration.hpp" />
<Unit filename="..\..\src\ai\ai_dfool.cpp" />
<Unit filename="..\..\src\ai\ai_dfool.hpp" />
<Unit filename="..\..\src\ai\ai_interface.cpp" />
<Unit filename="..\..\src\ai\ai_interface.hpp" />
<Unit filename="..\..\src\ai\ai_manager.cpp" />
<Unit filename="..\..\src\ai\ai_manager.hpp" />
<Unit filename="..\..\src\ai\ai_move.cpp" />
<Unit filename="..\..\src\ai\ai_village.cpp" />
<Unit filename="..\..\src\ai\actions.cpp" />
<Unit filename="..\..\src\ai\actions.hpp" />
<Unit filename="..\..\src\ai\ai2\ai.hpp" />
<Unit filename="..\..\src\ai\composite\ai.cpp" />
<Unit filename="..\..\src\ai\composite\ai.hpp" />
<Unit filename="..\..\src\ai\composite\contexts.cpp" />
@ -73,16 +60,29 @@
<Unit filename="..\..\src\ai\composite\rca.hpp" />
<Unit filename="..\..\src\ai\composite\stage.cpp" />
<Unit filename="..\..\src\ai\composite\stage.hpp" />
<Unit filename="..\..\src\ai\configuration.cpp" />
<Unit filename="..\..\src\ai\configuration.hpp" />
<Unit filename="..\..\src\ai\contexts.cpp" />
<Unit filename="..\..\src\ai\contexts.hpp" />
<Unit filename="..\..\src\ai\default\ai.cpp" />
<Unit filename="..\..\src\ai\default\ai.hpp" />
<Unit filename="..\..\src\ai\default\attack.cpp" />
<Unit filename="..\..\src\ai\default\contexts.cpp" />
<Unit filename="..\..\src\ai\default\contexts.hpp" />
<Unit filename="..\..\src\ai\formula_ai.cpp" />
<Unit filename="..\..\src\ai\formula_ai.hpp" />
<Unit filename="..\..\src\ai\formula_candidates.cpp" />
<Unit filename="..\..\src\ai\formula_candidates.hpp" />
<Unit filename="..\..\src\ai\default\move.cpp" />
<Unit filename="..\..\src\ai\default\village.cpp" />
<Unit filename="..\..\src\ai\dfool\ai.cpp" />
<Unit filename="..\..\src\ai\dfool\ai.hpp" />
<Unit filename="..\..\src\ai\formula\ai.cpp" />
<Unit filename="..\..\src\ai\formula\ai.hpp" />
<Unit filename="..\..\src\ai\formula\candidates.cpp" />
<Unit filename="..\..\src\ai\formula\candidates.hpp" />
<Unit filename="..\..\src\ai\game_info.cpp" />
<Unit filename="..\..\src\ai\game_info.hpp" />
<Unit filename="..\..\src\ai\interface.cpp" />
<Unit filename="..\..\src\ai\interface.hpp" />
<Unit filename="..\..\src\ai\manager.cpp" />
<Unit filename="..\..\src\ai\manager.hpp" />
<Unit filename="..\..\src\ai\registry.cpp" />
<Unit filename="..\..\src\ai\registry.hpp" />
<Unit filename="..\..\src\ai\testing.cpp" />

40
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -76,22 +76,9 @@
<Unit filename="..\..\src\addon_checks.hpp" />
<Unit filename="..\..\src\addon_management.cpp" />
<Unit filename="..\..\src\addon_management.hpp" />
<Unit filename="..\..\src\ai\ai.cpp" />
<Unit filename="..\..\src\ai\ai.hpp" />
<Unit filename="..\..\src\ai\ai2.hpp" />
<Unit filename="..\..\src\ai\ai_actions.cpp" />
<Unit filename="..\..\src\ai\ai_actions.hpp" />
<Unit filename="..\..\src\ai\ai_attack.cpp" />
<Unit filename="..\..\src\ai\ai_configuration.cpp" />
<Unit filename="..\..\src\ai\ai_configuration.hpp" />
<Unit filename="..\..\src\ai\ai_dfool.cpp" />
<Unit filename="..\..\src\ai\ai_dfool.hpp" />
<Unit filename="..\..\src\ai\ai_interface.cpp" />
<Unit filename="..\..\src\ai\ai_interface.hpp" />
<Unit filename="..\..\src\ai\ai_manager.cpp" />
<Unit filename="..\..\src\ai\ai_manager.hpp" />
<Unit filename="..\..\src\ai\ai_move.cpp" />
<Unit filename="..\..\src\ai\ai_village.cpp" />
<Unit filename="..\..\src\ai\actions.cpp" />
<Unit filename="..\..\src\ai\actions.hpp" />
<Unit filename="..\..\src\ai\ai2\ai.hpp" />
<Unit filename="..\..\src\ai\composite\ai.cpp" />
<Unit filename="..\..\src\ai\composite\ai.hpp" />
<Unit filename="..\..\src\ai\composite\contexts.cpp" />
@ -104,16 +91,29 @@
<Unit filename="..\..\src\ai\composite\rca.hpp" />
<Unit filename="..\..\src\ai\composite\stage.cpp" />
<Unit filename="..\..\src\ai\composite\stage.hpp" />
<Unit filename="..\..\src\ai\configuration.cpp" />
<Unit filename="..\..\src\ai\configuration.hpp" />
<Unit filename="..\..\src\ai\contexts.cpp" />
<Unit filename="..\..\src\ai\contexts.hpp" />
<Unit filename="..\..\src\ai\default\ai.cpp" />
<Unit filename="..\..\src\ai\default\ai.hpp" />
<Unit filename="..\..\src\ai\default\attack.cpp" />
<Unit filename="..\..\src\ai\default\contexts.cpp" />
<Unit filename="..\..\src\ai\default\contexts.hpp" />
<Unit filename="..\..\src\ai\formula_ai.cpp" />
<Unit filename="..\..\src\ai\formula_ai.hpp" />
<Unit filename="..\..\src\ai\formula_candidates.cpp" />
<Unit filename="..\..\src\ai\formula_candidates.hpp" />
<Unit filename="..\..\src\ai\default\move.cpp" />
<Unit filename="..\..\src\ai\default\village.cpp" />
<Unit filename="..\..\src\ai\dfool\ai.cpp" />
<Unit filename="..\..\src\ai\dfool\ai.hpp" />
<Unit filename="..\..\src\ai\formula\ai.cpp" />
<Unit filename="..\..\src\ai\formula\ai.hpp" />
<Unit filename="..\..\src\ai\formula\candidates.cpp" />
<Unit filename="..\..\src\ai\formula\candidates.hpp" />
<Unit filename="..\..\src\ai\game_info.cpp" />
<Unit filename="..\..\src\ai\game_info.hpp" />
<Unit filename="..\..\src\ai\interface.cpp" />
<Unit filename="..\..\src\ai\interface.hpp" />
<Unit filename="..\..\src\ai\manager.cpp" />
<Unit filename="..\..\src\ai\manager.hpp" />
<Unit filename="..\..\src\ai\registry.cpp" />
<Unit filename="..\..\src\ai\registry.hpp" />
<Unit filename="..\..\src\ai\testing.cpp" />

156
projectfiles/VC9/wesnoth.vcproj
View file

@ -2686,57 +2686,29 @@
Name="AI"
>
<File
RelativePath="..\..\src\ai\ai.cpp"
RelativePath="..\..\src\ai\actions.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_actions.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_attack.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_configuration.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_dfool.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_interface.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_manager.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_move.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_village.cpp"
RelativePath="..\..\src\ai\configuration.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\contexts.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\formula_ai.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\formula_candidates.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\game_info.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\interface.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\manager.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\registry.cpp"
>
@ -2776,10 +2748,46 @@
<Filter
Name="default"
>
<File
RelativePath="..\..\src\ai\default\ai.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\default\attack.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\default\contexts.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\default\move.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\default\village.cpp"
>
</File>
</Filter>
<Filter
Name="dfool"
>
<File
RelativePath="..\..\src\ai\dfool\ai.cpp"
>
</File>
</Filter>
<Filter
Name="formula"
>
<File
RelativePath="..\..\src\ai\formula\ai.cpp"
>
</File>
<File
RelativePath="..\..\src\ai\formula\candidates.cpp"
>
</File>
</Filter>
<Filter
Name="testing"
@ -3589,49 +3597,29 @@
Name="AI"
>
<File
RelativePath="..\..\src\ai\ai.hpp"
RelativePath="..\..\src\ai\actions.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai2.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_actions.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_configuration.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_dfool.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_interface.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\ai_manager.hpp"
RelativePath="..\..\src\ai\configuration.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\contexts.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\formula_ai.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\formula_candidates.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\game_info.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\interface.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\manager.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\registry.hpp"
>
@ -3640,6 +3628,14 @@
RelativePath="..\..\src\ai\testing.hpp"
>
</File>
<Filter
Name="ai2"
>
<File
RelativePath="..\..\src\ai\ai2\ai.hpp"
>
</File>
</Filter>
<Filter
Name="composite"
>
@ -3671,11 +3667,35 @@
<Filter
Name="default"
>
<File
RelativePath="..\..\src\ai\default\ai.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\default\contexts.hpp"
>
</File>
</Filter>
<Filter
Name="dfool"
>
<File
RelativePath="..\..\src\ai\dfool\ai.hpp"
>
</File>
</Filter>
<Filter
Name="formula"
>
<File
RelativePath="..\..\src\ai\formula\ai.hpp"
>
</File>
<File
RelativePath="..\..\src\ai\formula\candidates.hpp"
>
</File>
</Filter>
<Filter
Name="testing"
>

22
src/CMakeLists.txt
View file

@ -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

22
src/Makefile.am
View file

@ -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 \

22
src/SConscript
View file

@ -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

7
src/ai/ai_actions.cpp → src/ai/actions.cpp
View file

@ -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"

7
src/ai/ai_actions.hpp → src/ai/actions.hpp
View file

@ -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"

12
src/ai/ai2.hpp → src/ai/ai2/ai.hpp
View file

@ -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 {

2
src/ai/composite/ai.cpp
View file

@ -19,7 +19,7 @@
#include "ai.hpp"
#include "stage.hpp"
#include "../ai_manager.hpp"
#include "../manager.hpp"
#include "../../foreach.hpp"
#include "../../log.hpp"

2
src/ai/composite/ai.hpp
View file

@ -27,7 +27,7 @@
#include "stage.hpp"
#include "../contexts.hpp"
#include "../default/contexts.hpp"
#include "../ai_interface.hpp"
#include "../interface.hpp"
#include <vector>

6
src/ai/ai_configuration.cpp → src/ai/configuration.cpp
View file

@ -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"

6
src/ai/ai_configuration.hpp → src/ai/configuration.hpp
View file

@ -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"

3
src/ai/contexts.cpp
View file

@ -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"

2
src/ai/contexts.hpp
View file

@ -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"

36
src/ai/ai.cpp → src/ai/default/ai.cpp
View file

@ -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 <fstream>

18
src/ai/ai.hpp → src/ai/default/ai.hpp
View file

@ -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;

12
src/ai/ai_attack.cpp → src/ai/default/attack.cpp
View file

@ -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)

15
src/ai/ai_move.cpp → src/ai/default/move.cpp
View file

@ -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");

8
src/ai/ai_village.cpp → src/ai/default/village.cpp
View file

@ -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 <numeric>

13
src/ai/ai_dfool.cpp → src/ai/dfool/ai.cpp
View file

@ -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 {

19
src/ai/ai_dfool.hpp → src/ai/dfool/ai.hpp
View file

@ -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 <vector>
#include <list>

21
src/ai/formula_ai.cpp → src/ai/formula/ai.cpp
View file

@ -22,17 +22,18 @@
#include <vector>
#include <queue>
#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)

17
src/ai/formula_ai.hpp → src/ai/formula/ai.hpp
View file

@ -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;

8
src/ai/formula_candidates.cpp → src/ai/formula/candidates.cpp
View file

@ -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)

7
src/ai/formula_candidates.hpp → src/ai/formula/candidates.hpp
View file

@ -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;

4
src/ai/ai_interface.cpp → src/ai/interface.cpp
View file

@ -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 {

10
src/ai/ai_interface.hpp → src/ai/interface.hpp
View file

@ -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 {

16
src/ai/ai_manager.cpp → src/ai/manager.cpp
View file

@ -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"

5
src/ai/ai_manager.hpp → src/ai/manager.hpp
View file

@ -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"

8
src/ai/registry.cpp
View file

@ -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"

2
src/ai/testing.cpp
View file

@ -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"

2
src/ai/testing/stage_fallback.cpp
View file

@ -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"

2
src/ai/testing/stage_fallback.hpp
View file

@ -23,7 +23,7 @@
#include "../../global.hpp"
#include "../composite/stage.hpp"
#include "../ai_interface.hpp"
#include "../interface.hpp"
#include "../../config.hpp"
#include <vector>

2
src/game_events.cpp
View file

@ -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"

2
src/menu_events.cpp
View file

@ -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"

2
src/multiplayer_connect.cpp
View file

@ -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"

2
src/playsingle_controller.cpp
View file

@ -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"

2
src/team.cpp
View file

@ -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"