mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r24527) -Add: [NewGRF] Allow resolving var 5F via vehicle var 61.

This commit is contained in:
frosch 2012-09-16 16:29:48 +00:00
parent ce9019639d
commit e37e2d92a6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/newgrf_engine.cpp
View File

@ -645,7 +645,12 @@ static uint32 VehicleGetVariable(Vehicle *v, const ResolverObject *object, byte
Vehicle *u = v->Move((int32)GetRegister(0x10F));
if (u == NULL) return 0;
return VehicleGetVariable(u, object, parameter, GetRegister(0x10E), available);
if (parameter == 0x5F) {
/* This seems to be the only variable that makes sense to access via var 61, but is not handled by VehicleGetVariable */
return (u->random_bits << 8) | u->waiting_triggers;
} else {
return VehicleGetVariable(u, object, parameter, GetRegister(0x10E), available);
}
}
return 0;