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

(svn r26388) -Codechange: Move resolving of Action 3 into ResolverObject constructor.

Browse Source
This commit is contained in:
frosch
2014-03-03 20:02:31 +00:00
parent b0680afaa5
commit ce92faf682
17 changed files with 143 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf_cargo.cpp
View File

@@ -40,6 +40,7 @@ struct CargoResolverObject : public ResolverObject {
CargoResolverObject::CargoResolverObject(const CargoSpec *cs, CallbackID callback, uint32 callback_param1, uint32 callback_param2)
: ResolverObject(cs->grffile, callback, callback_param1, callback_param2)
{
this->root_spritegroup = cs->group;
}
/**
@@ -50,7 +51,7 @@ CargoResolverObject::CargoResolverObject(const CargoSpec *cs, CallbackID callbac
SpriteID GetCustomCargoSprite(const CargoSpec *cs)
{
CargoResolverObject object(cs);
const SpriteGroup *group = SpriteGroup::Resolve(cs->group, object);
const SpriteGroup *group = object.Resolve();
if (group == NULL) return 0;
return group->GetResult();
@@ -60,10 +61,7 @@ SpriteID GetCustomCargoSprite(const CargoSpec *cs)
uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const CargoSpec *cs)
{
CargoResolverObject object(cs, callback, param1, param2);
const SpriteGroup *group = SpriteGroup::Resolve(cs->group, object);
if (group == NULL) return CALLBACK_FAILED;
return group->GetCallbackResult();
return object.ResolveCallback();
}
/**