dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16391) -Codechange: use Train instead of Vehicle where appropriate.

Browse Source
This commit is contained in:
rubidium
2009-05-22 22:22:46 +00:00
parent 489253b630
commit 1324100d69
33 changed files with 429 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/elrail.cpp
View File

@@ -555,12 +555,15 @@ bool SettingsDisableElrail(int32 p1)
* normal rail too */
if (disable) {
FOR_ALL_VEHICLES(v) {
if (v->type == VEH_TRAIN && v->u.rail.railtype == RAILTYPE_ELECTRIC) {
if (v->type != VEH_TRAIN) continue;
Train *t = (Train *)v;
if (t->u.rail.railtype == RAILTYPE_ELECTRIC) {
/* this railroad vehicle is now compatible only with elrail,
* so add there also normal rail compatibility */
v->u.rail.compatible_railtypes |= RAILTYPES_RAIL;
v->u.rail.railtype = RAILTYPE_RAIL;
SetBit(v->u.rail.flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL);
t->u.rail.compatible_railtypes |= RAILTYPES_RAIL;
t->u.rail.railtype = RAILTYPE_RAIL;
SetBit(t->u.rail.flags, VRF_EL_ENGINE_ALLOWED_NORMAL_RAIL);
}
}
}
@@ -569,8 +572,9 @@ bool SettingsDisableElrail(int32 p1)
FOR_ALL_VEHICLES(v) {
/* power and acceleration is cached only for front engines */
if (v->type == VEH_TRAIN && IsFrontEngine(v)) {
TrainPowerChanged(v);
UpdateTrainAcceleration(v);
Train *t = (Train *)v;
TrainPowerChanged(t);
UpdateTrainAcceleration(t);
}
}