mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r17670) -Cleanup (r12819): ResolverObject::procedure_call is not used anymore.

release/1.0
frosch 2009-09-30 18:36:18 +00:00
parent 6a03335a0e
commit d8eec0ebf0
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/newgrf_spritegroup.cpp
View File

@ -143,7 +143,6 @@ const SpriteGroup *DeterministicSpriteGroup::Resolve(ResolverObject *object) con
bool available = true; bool available = true;
if (adjust->variable == 0x7E) { if (adjust->variable == 0x7E) {
ResolverObject subobject = *object; ResolverObject subobject = *object;
subobject.procedure_call = true;
const SpriteGroup *subgroup = SpriteGroup::Resolve(adjust->subroutine, &subobject); const SpriteGroup *subgroup = SpriteGroup::Resolve(adjust->subroutine, &subobject);
if (subgroup == NULL) { if (subgroup == NULL) {
value = CALLBACK_FAILED; value = CALLBACK_FAILED;

3
src/newgrf_spritegroup.h
View File

@ -289,7 +289,6 @@ struct ResolverObject {
CallbackID callback; CallbackID callback;
uint32 callback_param1; uint32 callback_param1;
uint32 callback_param2; uint32 callback_param2;
bool procedure_call; ///< true if we are currently resolving a var 0x7E procedure result.
byte trigger; byte trigger;
byte count; byte count;
@ -349,8 +348,6 @@ struct ResolverObject {
void (*SetTriggers)(const struct ResolverObject*, int); void (*SetTriggers)(const struct ResolverObject*, int);
uint32 (*GetVariable)(const struct ResolverObject*, byte, byte, bool*); uint32 (*GetVariable)(const struct ResolverObject*, byte, byte, bool*);
const SpriteGroup *(*ResolveReal)(const struct ResolverObject*, const RealSpriteGroup*); const SpriteGroup *(*ResolveReal)(const struct ResolverObject*, const RealSpriteGroup*);
ResolverObject() : procedure_call(false) { }
}; };
#endif /* NEWGRF_SPRITEGROUP_H */ #endif /* NEWGRF_SPRITEGROUP_H */