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

1 files changed, 3 insertions, 5 deletions

diff --git a/src/newgrf_cargo.cpp b/src/newgrf_cargo.cpp
index 4186b53f6..016698523 100644
--- a/src/newgrf_cargo.cpp
+++ b/src/newgrf_cargo.cpp
@@ -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();
 }
 
 /**