diff options
Diffstat (limited to 'src/newgrf_spritegroup.cpp')
-rw-r--r-- | src/newgrf_spritegroup.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp index 2d0ca71bb..74cba113b 100644 --- a/src/newgrf_spritegroup.cpp +++ b/src/newgrf_spritegroup.cpp @@ -142,13 +142,16 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject *object) con /* Try to get the variable. We shall assume it is available, unless told otherwise. */ bool available = true; if (adjust->variable == 0x7E) { - ResolverObject subobject = *object; - const SpriteGroup *subgroup = SpriteGroup::Resolve(adjust->subroutine, &subobject); + const SpriteGroup *subgroup = SpriteGroup::Resolve(adjust->subroutine, object); if (subgroup == NULL) { value = CALLBACK_FAILED; } else { value = subgroup->GetCallbackResult(); } + + /* Reset values to current scope. + * Note: 'last_value' and 'reseed' are shared between the main chain and the procedure */ + object->scope = this->var_scope; } else { value = GetVariable(object, adjust->variable, adjust->parameter, &available); } |