Mercurial > hg > openttd
changeset 7881:088db0c07ab9 draft
(svn r11431) -Codechange: [NewGRF] Add support for changing rail vehicle user-defined bit mask (prop 25) via callback 36
author | glx <glx@openttd.org> |
---|---|
date | Thu, 15 Nov 2007 00:13:12 +0000 |
parents | 0c095a634caa |
children | 3cf133973d26 |
files | src/newgrf_engine.cpp src/train_cmd.cpp src/vehicle.h |
diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/newgrf_engine.cpp +++ b/src/newgrf_engine.cpp @@ -548,7 +548,7 @@ cargo_classes |= GetCargo(u->cargo_type)->classes; common_cargos[u->cargo_type]++; - if (v->type == VEH_TRAIN) user_def_data |= RailVehInfo(u->engine_type)->user_def_data; + if (v->type == VEH_TRAIN) user_def_data |= u->u.rail.user_def_data; common_subtypes[u->cargo_subtype]++; }
--- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -236,6 +236,8 @@ 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)) {