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

Merge branch 'template_train_replacement' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-02-28 19:32:36 +00:00
parent a6168dd2f0 939a350864
commit deb6a4f5c1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/train.h
View File

@@ -229,7 +229,7 @@ protected: // These functions should not be called outside acceleration code.
inline uint16 GetPower() const inline uint16 GetPower() const
{ {
/* Power is not added for articulated parts */ /* Power is not added for articulated parts */
if (!this->IsArticulatedPart() && HasPowerOnRail(this->railtype, GetRailType(this->tile))) { if (!this->IsArticulatedPart() && (this->IsVirtual() || HasPowerOnRail(this->railtype, GetRailType(this->tile)))) {
uint16 power = GetVehicleProperty(this, PROP_TRAIN_POWER, RailVehInfo(this->engine_type)->power); uint16 power = GetVehicleProperty(this, PROP_TRAIN_POWER, RailVehInfo(this->engine_type)->power);
/* Halve power for multiheaded parts */ /* Halve power for multiheaded parts */
if (this->IsMultiheaded()) power /= 2; if (this->IsMultiheaded()) power /= 2;
@@ -246,7 +246,7 @@ protected: // These functions should not be called outside acceleration code.
inline uint16 GetPoweredPartPower(const Train *head) const inline uint16 GetPoweredPartPower(const Train *head) const
{ {
/* For powered wagons the engine defines the type of engine (i.e. railtype) */ /* For powered wagons the engine defines the type of engine (i.e. railtype) */
if (HasBit(this->flags, VRF_POWEREDWAGON) && HasPowerOnRail(head->railtype, GetRailType(this->tile))) { if (HasBit(this->flags, VRF_POWEREDWAGON) && (head->IsVirtual() || HasPowerOnRail(head->railtype, GetRailType(this->tile)))) {
return RailVehInfo(this->gcache.first_engine)->pow_wag_power; return RailVehInfo(this->gcache.first_engine)->pow_wag_power;
} }