(svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138)

1 files changed, 11 insertions, 1 deletions

diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp
index e187ddd9f..97e0114e2 100644
--- a/src/newgrf_spritegroup.cpp
+++ b/src/newgrf_spritegroup.cpp
@@ -5,6 +5,7 @@
 #include "variables.h"
 #include "macros.h"
 #include "oldpool.h"
+#include "newgrf_callbacks.h"
 #include "newgrf_spritegroup.h"
 #include "date.h"
 
@@ -142,7 +143,16 @@ static inline const SpriteGroup *ResolveVariable(const SpriteGroup *group, Resol
 
 		/* Try to get the variable. We shall assume it is available, unless told otherwise. */
 		bool available = true;
-		value = GetVariable(object, adjust->variable, adjust->parameter, &available);
+		if (adjust->variable == 0x7E) {
+			const SpriteGroup *subgroup = Resolve(adjust->subroutine, object);
+			if (subgroup == NULL || subgroup->type != SGT_CALLBACK) {
+				value = CALLBACK_FAILED;
+			} else {
+				value = subgroup->g.callback.result;
+			}
+		} else {
+			value = GetVariable(object, adjust->variable, adjust->parameter, &available);
+		}
 
 		if (!available) {
 			/* Unsupported property: skip further processing and return either