summaryrefslogtreecommitdiff
path: root/src/ai
diff options
context:
space:
mode:
authoryexo <yexo@openttd.org>2009-04-25 23:51:15 +0000
committeryexo <yexo@openttd.org>2009-04-25 23:51:15 +0000
commit660f90d37b764ba3e94adc798ab7cb5d05337b7c (patch)
tree58ac4f0bd063162ec74b3f811b092b092fbdb0ca /src/ai
parent486e5b4bfeb4916f0a285fb9749ba031fa16c278 (diff)
downloadopenttd-660f90d37b764ba3e94adc798ab7cb5d05337b7c.tar.xz
(svn r16151) -Codechange: move some includes around to prevent including half the AI api in non-noai related code.
Diffstat (limited to 'src/ai')
-rw-r--r--src/ai/ai.hpp1
-rw-r--r--src/ai/ai_core.cpp1
-rw-r--r--src/ai/api/ai_event_types.cpp3
-rw-r--r--src/ai/api/ai_event_types.hpp9
-rw-r--r--src/ai/api/ai_object.cpp1
5 files changed, 10 insertions, 5 deletions
diff --git a/src/ai/ai.hpp b/src/ai/ai.hpp
index 2653e66ae..7837edee0 100644
--- a/src/ai/ai.hpp
+++ b/src/ai/ai.hpp
@@ -8,6 +8,7 @@
#include "api/ai_event_types.hpp"
#include "../date_type.h"
#include "../core/string_compare_type.hpp"
+#include <map>
typedef std::map<const char *, class AIInfo *, StringCompare> AIInfoList;
diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp
index 2081e6436..ea2531b1b 100644
--- a/src/ai/ai_core.cpp
+++ b/src/ai/ai_core.cpp
@@ -15,6 +15,7 @@
#include "ai_scanner.hpp"
#include "ai_instance.hpp"
#include "ai_config.hpp"
+#include "api/ai_error.hpp"
/* static */ uint AI::frame_counter = 0;
/* static */ AIScanner *AI::ai_scanner = NULL;
diff --git a/src/ai/api/ai_event_types.cpp b/src/ai/api/ai_event_types.cpp
index f02cfc957..bf6bfeb88 100644
--- a/src/ai/api/ai_event_types.cpp
+++ b/src/ai/api/ai_event_types.cpp
@@ -3,6 +3,7 @@
/** @file ai_event_types.cpp Implementation of all EventTypes. */
#include "ai_event_types.hpp"
+#include "ai_vehicle.hpp"
#include "../../command_type.h"
#include "../../strings_func.h"
#include "../../settings_type.h"
@@ -69,7 +70,7 @@ Money AIEventEnginePreview::GetRunningCost()
return ::GetEngine(engine)->GetRunningCost();
}
-AIVehicle::VehicleType AIEventEnginePreview::GetVehicleType()
+int32 AIEventEnginePreview::GetVehicleType()
{
switch (::GetEngine(engine)->type) {
case VEH_ROAD: return AIVehicle::VT_ROAD;
diff --git a/src/ai/api/ai_event_types.hpp b/src/ai/api/ai_event_types.hpp
index 26ab49010..6cff88f52 100644
--- a/src/ai/api/ai_event_types.hpp
+++ b/src/ai/api/ai_event_types.hpp
@@ -7,10 +7,7 @@
#include "ai_object.hpp"
#include "ai_event.hpp"
-#include "ai_town.hpp"
-#include "ai_industry.hpp"
-#include "ai_engine.hpp"
-#include "ai_subsidy.hpp"
+#include "ai_company.hpp"
/**
* Event Vehicle Crash, indicating a vehicle of yours is crashed.
@@ -268,11 +265,15 @@ public:
*/
Money GetRunningCost();
+#ifdef DOXYGEN_SKIP
/**
* Get the type of the offered engine.
* @return The type the engine has.
*/
AIVehicle::VehicleType GetVehicleType();
+#else
+ int32 GetVehicleType();
+#endif
/**
* Accept the engine preview.
diff --git a/src/ai/api/ai_object.cpp b/src/ai/api/ai_object.cpp
index 64ae49349..7e531ac47 100644
--- a/src/ai/api/ai_object.cpp
+++ b/src/ai/api/ai_object.cpp
@@ -7,6 +7,7 @@
#include "../ai.hpp"
#include "../ai_storage.hpp"
#include "../ai_instance.hpp"
+#include "ai_error.hpp"
static AIStorage *GetStorage()
{