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

(svn r5240) - NewGRF: when there is more than one engine in a consist, base livery overrides and powered wagon weight/power on the last engine before the wagon.

release/0.5
peter1138 2006-06-12 11:38:07 +00:00
parent 84f553b47f
commit 02bde34b2b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
train_cmd.c
View File

@ -59,7 +59,7 @@ static void TrainCargoChanged(Vehicle* v)
// powered wagons have extra weight added // powered wagons have extra weight added
if (HASBIT(u->u.rail.flags, VRF_POWEREDWAGON)) if (HASBIT(u->u.rail.flags, VRF_POWEREDWAGON))
vweight += RailVehInfo(v->engine_type)->pow_wag_weight; vweight += RailVehInfo(u->u.rail.first_engine)->pow_wag_weight;
} }
// consist weight is the sum of the weight of all vehicles in the consist // consist weight is the sum of the weight of all vehicles in the consist
@ -79,7 +79,6 @@ static void TrainCargoChanged(Vehicle* v)
*/ */
void TrainPowerChanged(Vehicle* v) void TrainPowerChanged(Vehicle* v)
{ {
const RailVehicleInfo *rvi_v = RailVehInfo(v->engine_type);
Vehicle* u; Vehicle* u;
uint32 power = 0; uint32 power = 0;
@ -106,7 +105,7 @@ void TrainPowerChanged(Vehicle* v)
if (engine_has_power) power += rvi_u->power; if (engine_has_power) power += rvi_u->power;
if (HASBIT(u->u.rail.flags, VRF_POWEREDWAGON) && (wagon_has_power)) { if (HASBIT(u->u.rail.flags, VRF_POWEREDWAGON) && (wagon_has_power)) {
power += rvi_v->pow_wag_power; power += RailVehInfo(u->u.rail.first_engine)->pow_wag_power;
} }
} }
@ -149,6 +148,8 @@ void TrainConsistChanged(Vehicle* v)
u->u.rail.first_engine = (v == u) ? INVALID_ENGINE : first_engine; u->u.rail.first_engine = (v == u) ? INVALID_ENGINE : first_engine;
u->u.rail.railtype = GetEngine(u->engine_type)->railtype; u->u.rail.railtype = GetEngine(u->engine_type)->railtype;
if (IsTrainEngine(u)) first_engine = u->engine_type;
if (rvi_u->visual_effect != 0) { if (rvi_u->visual_effect != 0) {
u->u.rail.cached_vis_effect = rvi_u->visual_effect; u->u.rail.cached_vis_effect = rvi_u->visual_effect;
} else { } else {