petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
maedhros
2007-01-12 11:20:34 +00:00
parent 5afd50017d
commit 4ae861880b
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/newgrf_spritegroup.cpp
View File

@@ -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