summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfrosch <frosch@openttd.org>2009-09-30 18:36:18 +0000
committerfrosch <frosch@openttd.org>2009-09-30 18:36:18 +0000
commitd8eec0ebf0540954b5c52524d2a2d1478e94b7d8 (patch)
treef67b349d2ead25893da30236cfbf43de43d8b82c
parent6a03335a0e55a09745d63642150f25196a578cee (diff)
downloadopenttd-d8eec0ebf0540954b5c52524d2a2d1478e94b7d8.tar.xz
(svn r17670) -Cleanup (r12819): ResolverObject::procedure_call is not used anymore.
-rw-r--r--src/newgrf_spritegroup.cpp1
-rw-r--r--src/newgrf_spritegroup.h3
2 files changed, 0 insertions, 4 deletions
diff --git a/src/newgrf_spritegroup.cpp b/src/newgrf_spritegroup.cpp
index cf7139418..2d0ca71bb 100644
--- a/src/newgrf_spritegroup.cpp
+++ b/src/newgrf_spritegroup.cpp
@@ -143,7 +143,6 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject *object) con
bool available = true;
if (adjust->variable == 0x7E) {
ResolverObject subobject = *object;
- subobject.procedure_call = true;
const SpriteGroup *subgroup = SpriteGroup::Resolve(adjust->subroutine, &subobject);
if (subgroup == NULL) {
value = CALLBACK_FAILED;
diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h
index 928964be7..0f2ffbb3a 100644
--- a/src/newgrf_spritegroup.h
+++ b/src/newgrf_spritegroup.h
@@ -289,7 +289,6 @@ struct ResolverObject {
CallbackID callback;
uint32 callback_param1;
uint32 callback_param2;
- bool procedure_call; ///< true if we are currently resolving a var 0x7E procedure result.
byte trigger;
byte count;
@@ -349,8 +348,6 @@ struct ResolverObject {
void (*SetTriggers)(const struct ResolverObject*, int);
uint32 (*GetVariable)(const struct ResolverObject*, byte, byte, bool*);
const SpriteGroup *(*ResolveReal)(const struct ResolverObject*, const RealSpriteGroup*);
-
- ResolverObject() : procedure_call(false) { }
};
#endif /* NEWGRF_SPRITEGROUP_H */