Moved ai-related files to /src/ai/

Prefixes retained (at least for now).

po/wesnoth/POTFILES.in

@@ -2,11 +2,17 @@ src/about.cpp
 src/actions.cpp
 src/addon_checks.cpp
 src/addon_management.cpp
-src/ai_attack.cpp
-src/ai.cpp
-src/ai_dfool.cpp
-src/ai_move.cpp
-src/ai_village.cpp
+src/ai/ai_actions.cpp
+src/ai/ai_attack.cpp
+src/ai/ai_configuration.cpp
+src/ai/ai.cpp
+src/ai/ai_dfool.cpp
+src/ai/ai_interface.cpp
+src/ai/ai_manager.cpp
+src/ai/ai_move.cpp
+src/ai/ai_village.cpp
+src/ai/formula_ai.cpp
+src/ai/formula_candidates.cpp
 src/animated_game.cpp
 src/astarnode.cpp
 src/astarsearch.cpp
@@ -28,7 +34,6 @@ src/display.cpp
 src/events.cpp
 src/filesystem.cpp
 src/floating_textbox.cpp
-src/formula_ai.cpp
 src/formula.cpp
 src/formula_function.cpp
 src/formula_string_utils.cpp

projectfiles/VC9/wesnoth.vcproj

@@ -271,39 +271,39 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai.cpp"
+				RelativePath="..\..\src\ai\ai.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_actions.cpp"
+				RelativePath="..\..\src\ai\ai_actions.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_attack.cpp"
+				RelativePath="..\..\src\ai\ai_attack.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_configuration.cpp"
+				RelativePath="..\..\src\ai\ai_configuration.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_dfool.cpp"
+				RelativePath="..\..\src\ai\ai_dfool.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_interface.cpp"
+				RelativePath="..\..\src\ai\ai_interface.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_manager.cpp"
+				RelativePath="..\..\src\ai\ai_manager.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_move.cpp"
+				RelativePath="..\..\src\ai\ai_move.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_village.cpp"
+				RelativePath="..\..\src\ai\ai_village.cpp"
 				>
 			</File>
 			<File
@@ -407,11 +407,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\formula_ai.cpp"
+				RelativePath="..\..\src\ai\formula_ai.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\formula_candidates.cpp"
+				RelativePath="..\..\src\ai\formula_candidates.cpp"
 				>
 			</File>
 			<File
@@ -2762,31 +2762,31 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai.hpp"
+				RelativePath="..\..\src\ai\ai.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai2.hpp"
+				RelativePath="..\..\src\ai\ai2.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_actions.hpp"
+				RelativePath="..\..\src\ai\ai_actions.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_configuration.hpp"
+				RelativePath="..\..\src\ai\ai_configuration.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_dfool.hpp"
+				RelativePath="..\..\src\ai\ai_dfool.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_interface.hpp"
+				RelativePath="..\..\src\ai\ai_interface.hpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\ai_manager.hpp"
+				RelativePath="..\..\src\ai\ai_manager.hpp"
 				>
 			</File>
 			<File
@@ -2894,7 +2894,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\formula_ai.hpp"
+				RelativePath="..\..\src\ai\formula_ai.hpp"
 				>
 			</File>
 			<File
@@ -2902,7 +2902,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\formula_candidates.hpp"
+				RelativePath="..\..\src\ai\formula_candidates.hpp"
 				>
 			</File>
 			<File

src/CMakeLists.txt

@@ -205,15 +205,15 @@ SET(wesnoth-main_SRC
     actions.cpp
     addon_checks.cpp
     addon_management.cpp
-    ai.cpp
-    ai_actions.cpp
-    ai_attack.cpp
-    ai_configuration.cpp
-    ai_interface.cpp
-    ai_dfool.cpp
-    ai_manager.cpp
-    ai_move.cpp
-    ai_village.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
     animated_game.cpp
     attack_prediction.cpp
     attack_prediction_display.cpp
@@ -224,8 +224,8 @@ SET(wesnoth-main_SRC
     dialogs.cpp
     floating_textbox.cpp
     formula.cpp
-    formula_ai.cpp
-    formula_candidates.cpp
+    ai/formula_ai.cpp
+    ai/formula_candidates.cpp
     formula_function.cpp
     formula_tokenizer.cpp
     formula_string_utils.cpp

src/Makefile.am

@@ -42,15 +42,15 @@ wesnoth_source = \
 	actions.cpp \
 	addon_checks.cpp \
 	addon_management.cpp \
-	ai.cpp \
-	ai_actions.cpp \
-	ai_attack.cpp \
-	ai_configuration.cpp \
-	ai_dfool.cpp \
-	ai_interface.cpp \
-	ai_manager.cpp \
-	ai_move.cpp \
-	ai_village.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 \
 	animated_game.cpp \
 	attack_prediction.cpp \
 	attack_prediction_display.cpp \
@@ -61,8 +61,8 @@ wesnoth_source = \
 	dialogs.cpp \
 	floating_textbox.cpp \
 	formula.cpp \
-	formula_ai.cpp \
-	formula_candidates.cpp \
+	ai/formula_ai.cpp \
+	ai/formula_candidates.cpp \
 	formula_function.cpp \
 	formula_tokenizer.cpp \
 	formula_string_utils.cpp \

src/SConscript

@@ -148,14 +148,15 @@ wesnoth_sources = Split("""
     actions.cpp
     addon_checks.cpp
     addon_management.cpp
-    ai_attack.cpp
-    ai_actions.cpp
-    ai_configuration.cpp
-    ai_dfool.cpp
-    ai_interface.cpp
-    ai_manager.cpp
-    ai_move.cpp
-    ai_village.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
     animated_game.cpp
     attack_prediction.cpp
     attack_prediction_display.cpp
@@ -165,8 +166,8 @@ wesnoth_sources = Split("""
     dialogs.cpp
     floating_textbox.cpp
     formula.cpp
-    formula_ai.cpp
-    formula_candidates.cpp
+    ai/formula_ai.cpp
+    ai/formula_candidates.cpp
     formula_function.cpp
     formula_tokenizer.cpp
     formula_string_utils.cpp
@@ -273,7 +274,6 @@ wesnoth_sources = Split("""
 
 wesnoth_sources.extend(env.Object("game_preferences_display.cpp", EXTRA_DEFINE = env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None))
 wesnoth_sources.extend(env.Object(Split("""
-    ai.cpp
     config_cache.cpp
     multiplayer_connect.cpp
     """)))

src/ai/ai.cpp

@@ -13,27 +13,27 @@
 */
 
 /**
- * @file ai.cpp
+ * @file ai/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 "../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 "gettext.hpp"
-#include "log.hpp"
-#include "mouse_handler_base.hpp"
-#include "replay.hpp"
-#include "statistics.hpp"
-#include "unit_display.hpp"
-#include "wml_exception.hpp"
+#include "../game_end_exceptions.hpp"
+#include "../game_events.hpp"
+#include "../game_preferences.hpp"
+#include "../gettext.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>
 

src/ai/ai.hpp

@@ -12,16 +12,16 @@
    See the COPYING file for more details.
 */
 
-/** @file ai.hpp */
+/** @file ai/ai.hpp */
 
-#ifndef AI_HPP_INCLUDED
-#define AI_HPP_INCLUDED
+#ifndef AI_AI_HPP_INCLUDED
+#define AI_AI_HPP_INCLUDED
 
-#include "global.hpp"
+#include "../global.hpp"
 
-#include "actions.hpp"
+#include "../actions.hpp"
 #include "ai_interface.hpp"
-#include "formula_callable.hpp"
+#include "../formula_callable.hpp"
 
 class formula_ai;
 

src/ai/ai2.hpp

@@ -13,12 +13,12 @@
 */
 
 /**
- * @file ai2.hpp
+ * @file ai/ai2.hpp
  * AI-interface part 2, virtual.
  */
 
-#ifndef AI2_HPP_INCLUDED
-#define AI2_HPP_INCLUDED
+#ifndef AI_AI2_HPP_INCLUDED
+#define AI_AI2_HPP_INCLUDED
 
 #include "ai_interface.hpp"
 

src/ai/ai_actions.cpp

@@ -14,11 +14,11 @@
 
 /**
  * Managing the AI-Game interaction - AI actions and their results
- * @file ai_actions.cpp
+ * @file ai/ai_actions.cpp
  */
 
 #include "ai_actions.hpp"
-#include "log.hpp"
+#include "../log.hpp"
 
 #define DBG_AI_ACTIONS LOG_STREAM(debug, ai_actions)
 #define LOG_AI_ACTIONS LOG_STREAM(info, ai_actions)

src/ai/ai_actions.hpp

@@ -14,15 +14,15 @@
 
 /**
  * Managing the AI-Game interaction - AI actions and their results
- * @file ai_actions.hpp
+ * @file ai/ai_actions.hpp
  * */
 
-#ifndef AI_ACTIONS_HPP_INCLUDED
-#define AI_ACTIONS_HPP_INCLUDED
+#ifndef AI_AI_ACTIONS_HPP_INCLUDED
+#define AI_AI_ACTIONS_HPP_INCLUDED
 
-#include "global.hpp"
+#include "../global.hpp"
 
-#include "map_location.hpp"
+#include "../map_location.hpp"
 #include <memory>
 
 class ai_action_result {

src/ai/ai_attack.cpp

@@ -13,16 +13,16 @@
 */
 
 /**
- * @file ai_attack.cpp
+ * @file ai/ai_attack.cpp
  * Calculate & analyse attacks.
  */
 
-#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"
 
 
 #define LOG_AI LOG_STREAM(info, ai)

src/ai/ai_configuration.cpp

@@ -15,15 +15,15 @@
 
 /**
  * Managing the AI configuration
- * @file ai_configuration.cpp
+ * @file ai/ai_configuration.cpp
  */
 #include "ai_configuration.hpp"
-#include "filesystem.hpp"
-#include "foreach.hpp"
-#include "log.hpp"
-#include "serialization/parser.hpp"
-#include "serialization/preprocessor.hpp"
-#include "team.hpp"
+#include "../filesystem.hpp"
+#include "../foreach.hpp"
+#include "../log.hpp"
+#include "../serialization/parser.hpp"
+#include "../serialization/preprocessor.hpp"
+#include "../team.hpp"
 
 #define DBG_AI_CONFIGURATION LOG_STREAM(debug, ai_configuration)
 #define LOG_AI_CONFIGURATION LOG_STREAM(info, ai_configuration)

src/ai/ai_configuration.hpp

@@ -14,15 +14,15 @@
 
 /**
  * Managing the AIs configuration - headers
- * @file ai_configuration.hpp
+ * @file ai/ai_configuration.hpp
  * */
 
-#ifndef AI_CONFIGURATION_HPP_INCLUDED
-#define AI_CONFIGURATION_HPP_INCLUDED
+#ifndef AI_AI_CONFIGURATION_HPP_INCLUDED
+#define AI_AI_CONFIGURATION_HPP_INCLUDED
 
-#include "global.hpp"
+#include "../global.hpp"
 
-#include "config.hpp"
+#include "../config.hpp"
 
 
 #include <vector>

src/ai/ai_dfool.cpp

@@ -12,14 +12,14 @@
    See the COPYING file for more details.
 */
 
-/** @file ai_dfool.cpp */
+/** @file ai/ai_dfool.cpp */
 
-#include "global.hpp"
+#include "../global.hpp"
 
 #include "ai_dfool.hpp"
-#include "foreach.hpp"
-#include "log.hpp"
-#include "formula_string_utils.hpp"
+#include "../foreach.hpp"
+#include "../log.hpp"
+#include "../formula_string_utils.hpp"
 
 namespace dfool {
   void dfool_ai::play_turn(){

src/ai/ai_dfool.hpp

@@ -13,19 +13,19 @@
 */
 
 /**
- * @file ai_dfool.hpp
+ * @file ai/ai_dfool.hpp
  * This ai uses for its decisions only units it has "seen".
  */
 
-#ifndef AI_DFOOL_HPP_INCLUDED
-#define AI_DFOOL_HPP_INCLUDED
+#ifndef AI_AI_DFOOL_HPP_INCLUDED
+#define AI_AI_DFOOL_HPP_INCLUDED
 
-#include "global.hpp"
+#include "../global.hpp"
 
 #include "ai_interface.hpp"
-#include "map_location.hpp"
-#include "unit_map.hpp"
-#include "unit.hpp"
+#include "../map_location.hpp"
+#include "../unit_map.hpp"
+#include "../unit.hpp"
 
 #include <vector>
 #include <list>

src/ai/ai_interface.cpp

@@ -14,7 +14,7 @@
 
 /**
  * Base class for the AI and AI-ai_manager contract.
- * @file ai_interface.cpp
+ * @file ai/ai_interface.cpp
  */
 
 #include "ai_actions.hpp"

src/ai/ai_interface.hpp

@@ -13,21 +13,21 @@
 */
 
 /**
- * @file ai_interface.hpp
+ * @file ai/ai_interface.hpp
  * Interface to the AI.
  */
 
-#ifndef AI_INTERFACE_HPP_INCLUDED
-#define AI_INTERFACE_HPP_INCLUDED
+#ifndef AI_AI_INTERFACE_HPP_INCLUDED
+#define AI_AI_INTERFACE_HPP_INCLUDED
 
 class game_display;
 class gamemap;
 
-#include "formula_callable.hpp"
-#include "generic_event.hpp"
-#include "pathfind.hpp"
-#include "gamestatus.hpp"
-#include "playturn.hpp"
+#include "../formula_callable.hpp"
+#include "../generic_event.hpp"
+#include "../pathfind.hpp"
+#include "../gamestatus.hpp"
+#include "../playturn.hpp"
 
 class ai_attack_result;
 class ai_move_result;

src/ai/ai_manager.cpp

@@ -14,7 +14,7 @@
 
 /**
  * Managing the AI lifecycle
- * @file ai_manager.cpp
+ * @file ai/ai_manager.cpp
  */
 
 //@todo: shorten this list of includes, for this list is copypasted from ai.cpp
@@ -24,12 +24,12 @@
 #include "ai_manager.hpp"
 #include "ai_dfool.hpp"
 #include "formula_ai.hpp"
-#include "game_events.hpp"
-#include "game_preferences.hpp"
-#include "log.hpp"
-#include "replay.hpp"
-#include "serialization/string_utils.hpp"
-#include "statistics.hpp"
+#include "../game_events.hpp"
+#include "../game_preferences.hpp"
+#include "../log.hpp"
+#include "../replay.hpp"
+#include "../serialization/string_utils.hpp"
+#include "../statistics.hpp"
 
 #include <map>
 #include <stack>

src/ai/ai_manager.hpp

@@ -14,13 +14,13 @@
 
 /**
  * Managing the AIs lifecycle - headers
- * @file ai_manager.hpp
+ * @file ai_ai_manager.hpp
  * */
 
-#ifndef AI_MANAGER_HPP_INCLUDED
-#define AI_MANAGER_HPP_INCLUDED
+#ifndef AI_AI_MANAGER_HPP_INCLUDED
+#define AI_AI_MANAGER_HPP_INCLUDED
 
-#include "global.hpp"
+#include "../global.hpp"
 
 #include "ai_interface.hpp"
 #include <map>

src/ai/ai_move.cpp

@@ -12,13 +12,19 @@
    See the COPYING file for more details.
 */
 
-#include "global.hpp"
+/**
+ * AI Move decision support
+ * @file ai/ai_move.cpp
+ * */
+
+
+#include "../global.hpp"
 
 #include "ai.hpp"
-#include "gettext.hpp"
-#include "log.hpp"
-#include "map.hpp"
-#include "wml_exception.hpp"
+#include "../gettext.hpp"
+#include "../log.hpp"
+#include "../map.hpp"
+#include "../wml_exception.hpp"
 
 
 #define LOG_AI LOG_STREAM(info, ai)

src/ai/ai_village.cpp

@@ -13,16 +13,16 @@
 */
 
 /**
- * @file ai_village.cpp
+ * @file ai/ai_village.cpp
  * The village capturing part of the AI.
- * ai::get_villages and ai::find_villages are based on ai::get_villages is ai.cpp
+ * ai::get_villages and ai::find_villages are based on ai::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>
 

src/ai/formula_ai.cpp

@@ -12,20 +12,26 @@
    See the COPYING file for more details.
 */
 
+/**
+ * @file ai/formula_ai.cpp
+ * Defines formula ai candidate actions - headers
+ * */
+
+
 #include <boost/lexical_cast.hpp>
 #include <vector>
 #include <queue>
 
-#include "foreach.hpp"
-#include "unit.hpp"
+#include "../foreach.hpp"
+#include "../unit.hpp"
 
 #include "ai_manager.hpp"
-#include "menu_events.hpp"
-#include "filesystem.hpp"
-#include "foreach.hpp"
+#include "../menu_events.hpp"
+#include "../filesystem.hpp"
+#include "../foreach.hpp"
 #include "formula_ai.hpp"
-#include "log.hpp"
-#include "attack_prediction.hpp"
+#include "../log.hpp"
+#include "../attack_prediction.hpp"
 #include "formula_candidates.hpp"
 
 #define LOG_AI LOG_STREAM(info, formula_ai)

src/ai/formula_ai.hpp

@@ -12,17 +12,23 @@
    See the COPYING file for more details.
 */
 
-#ifndef FORMULA_AI_HPP_INCLUDED
-#define FORMULA_AI_HPP_INCLUDED
+/**
+ * @file ai/formula_ai.hpp
+ * Defines formula ai
+ * */
+
+
+#ifndef AI_FORMULA_AI_HPP_INCLUDED
+#define AI_FORMULA_AI_HPP_INCLUDED
 
 #include "ai.hpp"
 #include "ai_interface.hpp"
-#include "callable_objects.hpp"
-#include "formula.hpp"
-#include "formula_fwd.hpp"
-#include "formula_callable.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 "../formula_function.hpp"
 
 // Forward declaration needed for ai function symbol table
 class formula_ai;

src/ai/formula_candidates.cpp

@@ -12,13 +12,13 @@
 */
 
 /**
- * @file 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 "../log.hpp"
 
 #define LOG_AI LOG_STREAM(info, formula_ai)
 #define WRN_AI LOG_STREAM(warn, formula_ai)

src/ai/formula_candidates.hpp

@@ -12,12 +12,12 @@
 */
 
 /**
- * @file formula_candidates.hpp
+ * @file ai/formula_candidates.hpp
  * Defines formula ai candidate actions - headers
  * */
 
-#ifndef _FORMULA_CANDIDATES_HPP
-#define	_FORMULA_CANDIDATES_HPP
+#ifndef AI_FORMULA_CANDIDATES_HPP_INCLUDED
+#define	AI_FORMULA_CANDIDATES_HPP_INCLUDED
 
 namespace game_logic {
 

src/game_events.cpp

@@ -20,7 +20,7 @@
 #include "global.hpp"
 
 #include "actions.hpp"
-#include "ai_manager.hpp"
+#include "ai/ai_manager.hpp"
 #include "dialogs.hpp"
 #include "foreach.hpp"
 #include "game_end_exceptions.hpp"

src/menu_events.cpp

@@ -21,7 +21,7 @@
 
 #include "global.hpp"
 
-#include "ai_manager.hpp"
+#include "ai/ai_manager.hpp"
 #include "dialogs.hpp"
 #include "formatter.hpp"
 #include "filechooser.hpp"

src/multiplayer_connect.cpp

@@ -20,7 +20,7 @@
 #include "global.hpp"
 
 
-#include "ai_manager.hpp"
+#include "ai/ai_manager.hpp"
 #include "dialogs.hpp"
 #include "foreach.hpp"
 #include "gettext.hpp"

src/playsingle_controller.cpp

@@ -21,7 +21,7 @@
 
 #include "playsingle_controller.hpp"
 
-#include "ai_manager.hpp"
+#include "ai/ai_manager.hpp"
 #include "foreach.hpp"
 #include "game_end_exceptions.hpp"
 #include "gettext.hpp"

src/team.cpp

@@ -19,8 +19,8 @@
 
 #include "global.hpp"
 
-#include "ai_configuration.hpp"
-#include "ai_manager.hpp"
+#include "ai/ai_configuration.hpp"
+#include "ai/ai_manager.hpp"
 #include "foreach.hpp"
 #include "game_events.hpp"
 #include "gamestatus.hpp"