(svn r12924) -Feature: Introducing the so called 'engine pool' which primarily removes the fixed engine type limits and also happens to allow (with the patch option 'dynamic_engines') multiple NewGRF vehicle sets to coexist.

This commit is contained in:
peter1138
2008-04-29 21:31:29 +00:00
parent 6056d1fb31
commit 45034bc522
49 changed files with 654 additions and 435 deletions

View File

@@ -66,6 +66,7 @@
#include "player_base.h"
#include "tunnelbridge.h"
#include "engine_func.h"
#include "engine_base.h"
#include "table/sprites.h"
#include "table/elrail_data.h"
@@ -480,9 +481,9 @@ int32 SettingsDisableElrail(int32 p1)
const RailType new_railtype = disable ? RAILTYPE_RAIL : RAILTYPE_ELECTRIC;
/* walk through all train engines */
EngineID eid;
FOR_ALL_ENGINEIDS_OF_TYPE(eid, VEH_TRAIN) {
RailVehicleInfo *rv_info = &_rail_vehicle_info[eid];
Engine *e;
FOR_ALL_ENGINES_OF_TYPE(e, VEH_TRAIN) {
RailVehicleInfo *rv_info = &e->u.rail;
/* if it is an electric rail engine and its railtype is the wrong one */
if (rv_info->engclass == 2 && rv_info->railtype == old_railtype) {
/* change it to the proper one */