mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14926) -Feature: Automatically set last engine ageing year to the last 'introduction year plus half model life', to allow engines later than 2050 to appear.

release/0.7
peter1138 2009-01-08 21:48:59 +00:00
parent b522f73ba8
commit 0052c85002
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/engine.cpp
View File

@ -32,10 +32,9 @@
DEFINE_OLD_POOL_GENERIC(Engine, Engine) DEFINE_OLD_POOL_GENERIC(Engine, Engine)
enum { /** Year that engine aging stops. Engines will not reduce in reliability
YEAR_ENGINE_AGING_STOPS = 2050, * and no more engines will be introduced */
}; Year _year_engine_aging_stops;
/** Number of engines of each vehicle type in original engine data */ /** Number of engines of each vehicle type in original engine data */
const uint8 _engine_counts[4] = { const uint8 _engine_counts[4] = {
@ -231,11 +230,32 @@ static void CalcEngineReliability(Engine *e)
InvalidateWindowClasses(WC_REPLACE_VEHICLE); InvalidateWindowClasses(WC_REPLACE_VEHICLE);
} }
void SetYearEngineAgingStops()
{
/* Determine last engine aging year, default to 2050 as previously. */
_year_engine_aging_stops = 2050;
const Engine *e;
FOR_ALL_ENGINES(e) {
const EngineInfo *ei = &e->info;
/* Exclude certain engines */
if (!HasBit(ei->climates, _settings_game.game_creation.landscape)) continue;
if (e->type == VEH_TRAIN && e->u.rail.railveh_type == RAILVEH_WAGON) continue;
/* Base year ending date on half the model life */
YearMonthDay ymd;
ConvertDateToYMD(ei->base_intro + (ei->lifelength * 366) / 2, &ymd);
_year_engine_aging_stops = max(_year_engine_aging_stops, ymd.year);
}
}
void StartupEngines() void StartupEngines()
{ {
Engine *e; Engine *e;
/* Aging of vehicles stops, so account for that when starting late */ /* Aging of vehicles stops, so account for that when starting late */
const Date aging_date = min(_date, ConvertYMDToDate(YEAR_ENGINE_AGING_STOPS, 0, 1)); const Date aging_date = min(_date, ConvertYMDToDate(_year_engine_aging_stops, 0, 1));
FOR_ALL_ENGINES(e) { FOR_ALL_ENGINES(e) {
const EngineInfo *ei = &e->info; const EngineInfo *ei = &e->info;
@ -336,7 +356,7 @@ static CompanyID GetBestCompany(uint8 pp)
void EnginesDailyLoop() void EnginesDailyLoop()
{ {
if (_cur_year >= YEAR_ENGINE_AGING_STOPS) return; if (_cur_year >= _year_engine_aging_stops) return;
Engine *e; Engine *e;
FOR_ALL_ENGINES(e) { FOR_ALL_ENGINES(e) {
@ -447,7 +467,7 @@ static void NewVehicleAvailable(Engine *e)
void EnginesMonthlyLoop() void EnginesMonthlyLoop()
{ {
if (_cur_year < YEAR_ENGINE_AGING_STOPS) { if (_cur_year < _year_engine_aging_stops) {
Engine *e; Engine *e;
FOR_ALL_ENGINES(e) { FOR_ALL_ENGINES(e) {
/* Age the vehicle */ /* Age the vehicle */

1
src/engine_func.h
View File

@ -29,5 +29,6 @@ bool IsEngineBuildable(EngineID engine, VehicleType type, CompanyID company);
bool IsEngineRefittable(EngineID engine); bool IsEngineRefittable(EngineID engine);
CargoID GetEngineCargoType(EngineID engine); CargoID GetEngineCargoType(EngineID engine);
void SetCachedEngineCounts(); void SetCachedEngineCounts();
void SetYearEngineAgingStops();
#endif /* ENGINE_H */ #endif /* ENGINE_H */

2
src/newgrf.cpp
View File

@ -6039,6 +6039,8 @@ static void AfterLoadGRFs()
} }
} }
SetYearEngineAgingStops();
/* Deallocate temporary loading data */ /* Deallocate temporary loading data */
free(_gted); free(_gted);
_grm_sprites.clear(); _grm_sprites.clear();