mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r24371) -Add: [NewGRF] Allow vehicle variable 61 for callback 2D (recolour) and re-randomisation.

release/1.3
michi_cc 2012-07-02 19:31:26 +00:00
parent 2e1ad8fd06
commit 6f88071942
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/newgrf_engine.cpp
View File

@ -640,7 +640,8 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte
if (!v->IsGroundVehicle() || parameter == 0x61) return 0; if (!v->IsGroundVehicle() || parameter == 0x61) return 0;
/* Only allow callbacks that don't change properties to avoid circular dependencies. */ /* 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)); Vehicle *u = v->Move((int32)GetRegister(0x10F));
if (u == NULL) return 0; if (u == NULL) return 0;