dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r26172) -Codechange: Make SpriteGroup::Resolve aware of nested calls.

Browse Source
This commit is contained in:
frosch
2013-12-23 18:08:16 +00:00
parent 71e2ca5822
commit badbd2f894
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf_spritegroup.h
View File

@@ -81,19 +81,7 @@ public:
virtual byte GetNumResults() const { return 0; }
virtual uint16 GetCallbackResult() const { return CALLBACK_FAILED; }
/**
* ResolverObject (re)entry point.
* This cannot be made a call to a virtual function because virtual functions
* do not like NULL and checking for NULL *everywhere* is more cumbersome than
* this little helper function.
* @param group the group to resolve for
* @param object information needed to resolve the group
* @return the resolved group
*/
static const SpriteGroup *Resolve(const SpriteGroup *group, ResolverObject &object)
{
return group == NULL ? NULL : group->Resolve(object);
}
static const SpriteGroup *Resolve(const SpriteGroup *group, ResolverObject &object, bool top_level = true);
};