summaryrefslogtreecommitdiff
path: root/src/ai/api
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2011-02-05 20:41:13 +0000
committerfrosch <frosch@openttd.org>2011-02-05 20:41:13 +0000
commitef3ec0f8c83567f0fce799270ea2e43ab7bb8cb0 (patch)
tree15ad2600b7a156154ccd87decd68b68315eb1836 /src/ai/api
parentfaa2a26ae15d6a8cf986059ed504b3371e6c3e37 (diff)
downloadopenttd-ef3ec0f8c83567f0fce799270ea2e43ab7bb8cb0.tar.xz
(svn r21987) -Fix: Make news items, engine previews and AI preview events deal with no longer existing Engine items after resetting the pool.
Diffstat (limited to 'src/ai/api')
-rw-r--r--src/ai/api/ai_event_types.cpp14
-rw-r--r--src/ai/api/ai_event_types.hpp1
2 files changed, 15 insertions, 0 deletions
diff --git a/src/ai/api/ai_event_types.cpp b/src/ai/api/ai_event_types.cpp
index e91e60b6f..30787d3af 100644
--- a/src/ai/api/ai_event_types.cpp
+++ b/src/ai/api/ai_event_types.cpp
@@ -19,8 +19,15 @@
#include "../../articulated_vehicles.h"
#include "table/strings.h"
+bool AIEventEnginePreview::IsEngineValid() const
+{
+ const Engine *e = ::Engine::GetIfValid(this->engine);
+ return e != NULL && e->IsEnabled();
+}
+
char *AIEventEnginePreview::GetName()
{
+ if (!this->IsEngineValid()) return NULL;
static const int len = 64;
char *engine_name = MallocT<char>(len);
@@ -31,6 +38,7 @@ char *AIEventEnginePreview::GetName()
CargoID AIEventEnginePreview::GetCargoType()
{
+ if (!this->IsEngineValid()) return CT_INVALID;
CargoArray cap = ::GetCapacityOfArticulatedParts(this->engine);
CargoID most_cargo = CT_INVALID;
@@ -47,6 +55,7 @@ CargoID AIEventEnginePreview::GetCargoType()
int32 AIEventEnginePreview::GetCapacity()
{
+ if (!this->IsEngineValid()) return -1;
const Engine *e = ::Engine::Get(this->engine);
switch (e->type) {
case VEH_ROAD:
@@ -69,6 +78,7 @@ int32 AIEventEnginePreview::GetCapacity()
int32 AIEventEnginePreview::GetMaxSpeed()
{
+ if (!this->IsEngineValid()) return -1;
const Engine *e = ::Engine::Get(this->engine);
int32 max_speed = e->GetDisplayMaxSpeed(); // km-ish/h
if (e->type == VEH_AIRCRAFT) max_speed /= _settings_game.vehicle.plane_speed;
@@ -77,16 +87,19 @@ int32 AIEventEnginePreview::GetMaxSpeed()
Money AIEventEnginePreview::GetPrice()
{
+ if (!this->IsEngineValid()) return -1;
return ::Engine::Get(this->engine)->GetCost();
}
Money AIEventEnginePreview::GetRunningCost()
{
+ if (!this->IsEngineValid()) return -1;
return ::Engine::Get(this->engine)->GetRunningCost();
}
int32 AIEventEnginePreview::GetVehicleType()
{
+ if (!this->IsEngineValid()) return AIVehicle::VT_INVALID;
switch (::Engine::Get(this->engine)->type) {
case VEH_ROAD: return AIVehicle::VT_ROAD;
case VEH_TRAIN: return AIVehicle::VT_RAIL;
@@ -98,6 +111,7 @@ int32 AIEventEnginePreview::GetVehicleType()
bool AIEventEnginePreview::AcceptPreview()
{
+ if (!this->IsEngineValid()) return false;
return AIObject::DoCommand(0, this->engine, 0, CMD_WANT_ENGINE_PREVIEW);
}
diff --git a/src/ai/api/ai_event_types.hpp b/src/ai/api/ai_event_types.hpp
index 7ca675eeb..51bfa6cd9 100644
--- a/src/ai/api/ai_event_types.hpp
+++ b/src/ai/api/ai_event_types.hpp
@@ -296,6 +296,7 @@ public:
private:
EngineID engine;
+ bool IsEngineValid() const;
};
/**