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

(svn r24681) -Codechange: Add resolver classes for cargoes.

release/1.3
alberth 2012-11-10 20:39:39 +00:00
parent 35cee8315a
commit 0885a2370a
2 changed files with 15 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/newgrf_cargo.cpp
View File

@ -13,34 +13,18 @@
#include "debug.h" #include "debug.h"
#include "newgrf_spritegroup.h" #include "newgrf_spritegroup.h"
static uint32 CargoGetRandomBits(const ResolverObject *object) struct CargoResolverObject : public ResolverObject {
{ CargoResolverObject(const CargoSpec *cs, CallbackID callback = CBID_NO_CALLBACK, uint32 callback_param1 = 0, uint32 callback_param2 = 0);
return 0;
}
/* virtual */ ScopeResolver *GetScope(VarSpriteGroupScope scope = VSG_SCOPE_SELF, byte relative = 0)
{
return &this->default_scope; //XXX ResolverObject::GetScope(scope, relative);
}
static uint32 CargoGetTriggers(const ResolverObject *object) /* virtual */ const SpriteGroup *ResolveReal(const RealSpriteGroup *group) const;
{ };
return 0;
}
/* virtual */ const SpriteGroup *CargoResolverObject::ResolveReal(const RealSpriteGroup *group) const
static void CargoSetTriggers(const ResolverObject *object, int triggers)
{
return;
}
static uint32 CargoGetVariable(const ResolverObject *object, byte variable, uint32 parameter, bool *available)
{
DEBUG(grf, 1, "Unhandled cargo variable 0x%X", variable);
*available = false;
return UINT_MAX;
}
static const SpriteGroup *CargoResolveReal(const ResolverObject *object, const RealSpriteGroup *group)
{ {
/* Cargo action 2s should always have only 1 "loaded" state, but some /* Cargo action 2s should always have only 1 "loaded" state, but some
* times things don't follow the spec... */ * times things don't follow the spec... */
@ -50,34 +34,15 @@ static const SpriteGroup *CargoResolveReal(const ResolverObject *object, const R
return NULL; return NULL;
} }
CargoResolverObject::CargoResolverObject(const CargoSpec *cs, CallbackID callback, uint32 callback_param1, uint32 callback_param2)
static void NewCargoResolver(ResolverObject *res, const CargoSpec *cs) : ResolverObject(cs->grffile, callback, callback_param1, callback_param2)
{ {
res->GetRandomBits = &CargoGetRandomBits;
res->GetTriggers = &CargoGetTriggers;
res->SetTriggers = &CargoSetTriggers;
res->GetVariable = &CargoGetVariable;
res->ResolveRealMethod = &CargoResolveReal;
res->u.cargo.cs = cs;
res->callback = CBID_NO_CALLBACK;
res->callback_param1 = 0;
res->callback_param2 = 0;
res->ResetState();
res->grffile = cs->grffile;
} }
SpriteID GetCustomCargoSprite(const CargoSpec *cs) SpriteID GetCustomCargoSprite(const CargoSpec *cs)
{ {
const SpriteGroup *group; CargoResolverObject object(cs);
ResolverObject object; const SpriteGroup *group = SpriteGroup::Resolve(cs->group, &object);
NewCargoResolver(&object, cs);
group = SpriteGroup::Resolve(cs->group, &object);
if (group == NULL) return 0; if (group == NULL) return 0;
return group->GetResult(); return group->GetResult();
@ -86,15 +51,8 @@ SpriteID GetCustomCargoSprite(const CargoSpec *cs)
uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const CargoSpec *cs) uint16 GetCargoCallback(CallbackID callback, uint32 param1, uint32 param2, const CargoSpec *cs)
{ {
ResolverObject object; CargoResolverObject object(cs, callback, param1, param2);
const SpriteGroup *group; const SpriteGroup *group = SpriteGroup::Resolve(cs->group, &object);
NewCargoResolver(&object, cs);
object.callback = callback;
object.callback_param1 = param1;
object.callback_param2 = param2;
group = SpriteGroup::Resolve(cs->group, &object);
if (group == NULL) return CALLBACK_FAILED; if (group == NULL) return CALLBACK_FAILED;
return group->GetCallbackResult(); return group->GetCallbackResult();

3
src/newgrf_spritegroup.h
View File

@ -378,9 +378,6 @@ struct ResolverObject {
IndustryGfx gfx; IndustryGfx gfx;
IndustryType type; IndustryType type;
} industry; } industry;
struct {
const struct CargoSpec *cs;
} cargo;
struct { struct {
CargoID cargo_type; CargoID cargo_type;
uint8 default_selection; uint8 default_selection;