From 4ae861880bda8a0882db1a6bd1e82cff003248a6 Mon Sep 17 00:00:00 2001 From: maedhros Date: Fri, 12 Jan 2007 11:20:34 +0000 Subject: (svn r8075) -Feature: Add support for variable 7E - subroutines. (peter1138) --- src/newgrf_spritegroup.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/newgrf_spritegroup.cpp') 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 -- cgit v1.2.3-70-g09d2