From 7fb02749acdf2a38eb6de89fd27b4fb8eada6a5c Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 17 May 2006 08:20:36 +0000 Subject: (svn r4896) - NewGRF: add support for vehicle property 0x25 (user defined data) used by variable 0x42. --- newgrf_engine.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'newgrf_engine.c') diff --git a/newgrf_engine.c b/newgrf_engine.c index 46af6e888..c89dbd0a7 100644 --- a/newgrf_engine.c +++ b/newgrf_engine.c @@ -534,6 +534,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by byte cargo_classes = 0; uint common_cargo_best = 0; uint common_cargos[NUM_GLOBAL_CID]; + byte user_def_data = 0; CargoID cargo; CargoID common_cargo_type = GC_PASSENGERS; @@ -547,6 +548,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by cargo = _global_cargo_id[_opt.landscape][u->cargo_type]; cargo_classes |= _cargo_classes[cargo]; common_cargos[cargo]++; + user_def_data |= RailVehInfo(u->engine_type)->user_def_data; } /* Pick the most common cargo type */ @@ -557,7 +559,7 @@ static uint32 VehicleGetVariable(const ResolverObject *object, byte variable, by } } - return cargo_classes | (common_cargo_type << 8); + return cargo_classes | (common_cargo_type << 8) | (user_def_data << 24); } case 0x43: /* Player information */ -- cgit v1.2.3-54-g00ecf