summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichi_cc <michi_cc@openttd.org>2012-07-02 19:31:26 +0000
committermichi_cc <michi_cc@openttd.org>2012-07-02 19:31:26 +0000
commit6f8807194275893b7442f32ff544920dd35baf76 (patch)
treeef4d73ff0508614750a025478a92e60c7b85d9f9
parent2e1ad8fd0667ab64f4ed62f99d3cb6635550bc9f (diff)
downloadopenttd-6f8807194275893b7442f32ff544920dd35baf76.tar.xz
(svn r24371) -Add: [NewGRF] Allow vehicle variable 61 for callback 2D (recolour) and re-randomisation.
-rw-r--r--src/newgrf_engine.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
index 908d15a84..23f32924f 100644
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -640,7 +640,8 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte
if (!v->IsGroundVehicle() || parameter == 0x61) return 0;
/* Only allow callbacks that don't change properties to avoid circular dependencies. */
- if (object->callback == CBID_NO_CALLBACK || object->callback == CBID_TRAIN_ALLOW_WAGON_ATTACH || object->callback == CBID_VEHICLE_START_STOP_CHECK || object->callback == CBID_VEHICLE_32DAY_CALLBACK) {
+ if (object->callback == CBID_NO_CALLBACK || object->callback == CBID_RANDOM_TRIGGER || object->callback == CBID_TRAIN_ALLOW_WAGON_ATTACH ||
+ object->callback == CBID_VEHICLE_START_STOP_CHECK || object->callback == CBID_VEHICLE_32DAY_CALLBACK || object->callback == CBID_VEHICLE_COLOUR_MAPPING) {
Vehicle *u = v->Move((int32)GetRegister(0x10F));
if (u == NULL) return 0;