diff options
| author | yexo <yexo@openttd.org> | 2009-04-25 23:51:15 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2009-04-25 23:51:15 +0000 |
| commit | 660f90d37b764ba3e94adc798ab7cb5d05337b7c (patch) | |
| tree | 58ac4f0bd063162ec74b3f811b092b092fbdb0ca /src/ai/api | |
| parent | 486e5b4bfeb4916f0a285fb9749ba031fa16c278 (diff) | |
| download | openttd-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/api')
| -rw-r--r-- | src/ai/api/ai_event_types.cpp | 3 | ||||
| -rw-r--r-- | src/ai/api/ai_event_types.hpp | 9 | ||||
| -rw-r--r-- | src/ai/api/ai_object.cpp | 1 |
3 files changed, 8 insertions, 5 deletions
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() { |