summaryrefslogtreecommitdiff
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
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.
-rw-r--r--src/ai/api/ai_event_types.cpp14
-rw-r--r--src/ai/api/ai_event_types.hpp1
-rw-r--r--src/engine.cpp4
-rw-r--r--src/news_func.h1
-rw-r--r--src/news_gui.cpp18
-rw-r--r--src/saveload/afterload.cpp3
6 files changed, 41 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;
};
/**
diff --git a/src/engine.cpp b/src/engine.cpp
index 2a6183d7e..d08fbef32 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -499,6 +499,7 @@ void SetCachedEngineCounts()
void SetupEngines()
{
+ DeleteWindowByClass(WC_ENGINE_PREVIEW);
_engine_pool.CleanPool();
assert(_engine_mngr.Length() >= _engine_mngr.NUM_DEFAULT_ENGINES);
@@ -859,6 +860,9 @@ void EnginesMonthlyLoop()
CalcEngineReliability(e);
}
+ /* Do not introduce invalid engines */
+ if (!e->IsEnabled()) continue;
+
if (!(e->flags & ENGINE_AVAILABLE) && _date >= (e->intro_date + DAYS_IN_YEAR)) {
/* Introduce it to all companies */
NewVehicleAvailable(e);
diff --git a/src/news_func.h b/src/news_func.h
index 8e63aba7f..4ee7ae000 100644
--- a/src/news_func.h
+++ b/src/news_func.h
@@ -51,6 +51,7 @@ extern bool _news_ticker_sound;
extern NewsTypeData _news_type_data[];
+void DeleteInvalidEngineNews();
void DeleteVehicleNews(VehicleID vid, StringID news);
void DeleteStationNews(StationID sid);
void DeleteIndustryNews(IndustryID iid);
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index cf7b3e91b..a958e6392 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -28,6 +28,7 @@
#include "statusbar_gui.h"
#include "company_manager_face.h"
#include "company_func.h"
+#include "engine_base.h"
#include "engine_gui.h"
#include "core/geometry_func.hpp"
@@ -809,6 +810,23 @@ void DeleteIndustryNews(IndustryID iid)
}
}
+/**
+ * Remove engine announcements for invalid engines.
+ */
+void DeleteInvalidEngineNews()
+{
+ NewsItem *ni = _oldest_news;
+
+ while (ni != NULL) {
+ NewsItem *next = ni->next;
+ if ((ni->reftype1 == NR_ENGINE && (!Engine::IsValidID(ni->ref1) || !Engine::Get(ni->ref1)->IsEnabled())) ||
+ (ni->reftype2 == NR_ENGINE && (!Engine::IsValidID(ni->ref2) || !Engine::Get(ni->ref2)->IsEnabled()))) {
+ DeleteNewsItem(ni);
+ }
+ ni = next;
+ }
+}
+
static void RemoveOldNewsItems()
{
NewsItem *next;
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 2d428d5ce..dc021af33 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -51,6 +51,7 @@
#include "../rail_gui.h"
#include "../core/backup_type.hpp"
#include "../smallmap_gui.h"
+#include "../news_func.h"
#include "table/strings.h"
@@ -2604,6 +2605,8 @@ void ReloadNewGRFData()
AfterLoadStations();
/* Check and update house and town values */
UpdateHousesAndTowns();
+ /* Delete news referring to no longer existing entities */
+ DeleteInvalidEngineNews();
/* Update livery selection windows */
for (CompanyID i = COMPANY_FIRST; i < MAX_COMPANIES; i++) InvalidateWindowData(WC_COMPANY_COLOUR, i);
/* redraw the whole screen */