Mercurial > hg > openttd

changeset 15521:b56282f31197 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r20175) -Change: [NewGRF] Adapt vehicle var FE bit 6 to new railtypes.
author frosch <frosch@openttd.org>
date Sat, 17 Jul 2010 15:38:51 +0000
parents 108708b7faf1
children 4bd9f2b2f85b
files src/newgrf_engine.cpp
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -673,11 +673,10 @@
 				const Train *u = t->IsWagon() && HasBit(t->vehicle_flags, VRF_POWEREDWAGON) ? t->First() : t;
 				RailType railtype = GetRailType(v->tile);
 				bool powered = t->IsEngine() || (t->IsWagon() && HasBit(t->vehicle_flags, VRF_POWEREDWAGON));
-				bool has_power = powered && HasPowerOnRail(u->railtype, railtype);
-				bool is_electric = powered && u->railtype == RAILTYPE_ELECTRIC;
+				bool has_power = HasPowerOnRail(u->railtype, railtype);
 
-				if (has_power) SetBit(modflags, 5);
-				if (is_electric && !has_power) SetBit(modflags, 6);
+				if (powered && has_power) SetBit(modflags, 5);
+				if (powered && !has_power) SetBit(modflags, 6);
 				if (HasBit(t->flags, VRF_TOGGLE_REVERSE)) SetBit(modflags, 8);
 			}
 			if (HasBit(v->vehicle_flags, VF_BUILT_AS_PROTOTYPE)) SetBit(modflags, 10);