Mercurial > hg > openttd

changeset 3926:9404ad1a66ae draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r5061) - NewGRF: always use visual effect callback if it is defined, not just for powered wagons.
author peter1138 <peter1138@openttd.org>
date Wed, 31 May 2006 18:00:08 +0000
parents bbc9db6fbe81
children db69d368fa8f
files train_cmd.c
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -167,14 +167,15 @@
 		if (!IsArticulatedPart(u)) {
 			// check if its a powered wagon
 			CLRBIT(u->u.rail.flags, VRF_POWEREDWAGON);
+
+			/* Check powered wagon / visual effect callback */
+			if (HASBIT(rvi_u->callbackmask, CBM_WAGON_POWER)) {
+				uint16 callback = GetVehicleCallback(CBID_TRAIN_WAGON_POWER, 0, 0, u->engine_type, u);
+
+				if (callback != CALLBACK_FAILED) u->u.rail.cached_vis_effect = callback;
+			}
+
 			if ((rvi_v->pow_wag_power != 0) && (rvi_u->flags & RVI_WAGON) && UsesWagonOverride(u)) {
-				if (HASBIT(rvi_u->callbackmask, CBM_WAGON_POWER)) {
-					uint16 callback = GetVehicleCallback(CBID_TRAIN_WAGON_POWER, 0, 0, u->engine_type, u);
-
-					if (callback != CALLBACK_FAILED)
-						u->u.rail.cached_vis_effect = callback;
-				}
-
 				if (u->u.rail.cached_vis_effect < 0x40) {
 					/* wagon is powered */
 					SETBIT(u->u.rail.flags, VRF_POWEREDWAGON); // cache 'powered' status