# HG changeset patch
# User frosch <frosch@openttd.org>
# Date 2012-09-16 16:29:48
# Node ID 02aa696edbd246058c00ecff1d35971983a85753
# Parent  52654b0d1ceb2f8f7d00a743a344977f964281bb

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

diff --git a/src/newgrf_engine.cpp b/src/newgrf_engine.cpp
--- a/src/newgrf_engine.cpp
+++ b/src/newgrf_engine.cpp
@@ -645,7 +645,12 @@ static uint32 VehicleGetVariable(Vehicle
 				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;