(svn r12377) -Fix [FS#1854]: set cached value for vehicle property 25 before other cached values
authorglx
Mon, 17 Mar 2008 21:49:14 +0000
changeset 9199 39147e16a5a0
parent 9198 1442ea35d8dd
child 9200 8daa2f627bdb
(svn r12377) -Fix [FS#1854]: set cached value for vehicle property 25 before other cached values
src/train_cmd.cpp
--- a/src/train_cmd.cpp	Sat Mar 15 22:43:28 2008 +0000
+++ b/src/train_cmd.cpp	Mon Mar 17 21:49:14 2008 +0000
@@ -214,6 +214,9 @@
 		/* Reset color map */
 		u->colormap = PAL_NONE;
 
+		/* Set user defined data (must be done before other properties) */
+		u->u.rail.user_def_data = GetVehicleProperty(u, 0x25, rvi_u->user_def_data);
+
 		if (rvi_u->visual_effect != 0) {
 			u->u.rail.cached_vis_effect = rvi_u->visual_effect;
 		} else {
@@ -270,8 +273,6 @@
 			u->cargo_cap = GetVehicleProperty(u, 0x14, rvi_u->capacity);
 		}
 
-		u->u.rail.user_def_data = GetVehicleProperty(u, 0x25, rvi_u->user_def_data);
-
 		/* check the vehicle length (callback) */
 		uint16 veh_len = CALLBACK_FAILED;
 		if (HasBit(EngInfo(u->engine_type)->callbackmask, CBM_VEHICLE_LENGTH)) {