diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-23 12:13:42 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-23 12:13:42 +0000 |
| commit | f490394aa8d78f4118e73beccc724cbad3b44854 (patch) | |
| tree | 066d0254c6624bdb2646e30d9b43076fc7de6726 /src/newgrf_house.cpp | |
| parent | b270ca84ba0002ae23aed3bb614e06b19c7197f5 (diff) | |
| download | openttd-f490394aa8d78f4118e73beccc724cbad3b44854.tar.xz | |
(svn r16396) -Codechange: split NewGRF spritegroup into multiple subclasses instead of using a big union
Diffstat (limited to 'src/newgrf_house.cpp')
| -rw-r--r-- | src/newgrf_house.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index 15052c7b5..f49da4603 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -309,7 +309,7 @@ static uint32 HouseGetVariable(const ResolverObject *object, byte variable, byte return UINT_MAX; } -static const SpriteGroup *HouseResolveReal(const ResolverObject *object, const SpriteGroup *group) +static const SpriteGroup *HouseResolveReal(const ResolverObject *object, const RealSpriteGroup *group) { /* Houses do not have 'real' groups */ return NULL; @@ -355,14 +355,14 @@ uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, House object.callback_param2 = param2; group = Resolve(GetHouseSpecs(house_id)->spritegroup, &object); - if (group == NULL || group->type != SGT_CALLBACK) return CALLBACK_FAILED; + if (group == NULL) return CALLBACK_FAILED; - return group->g.callback.result; + return group->GetCallbackResult(); } -static void DrawTileLayout(const TileInfo *ti, const SpriteGroup *group, byte stage, HouseID house_id) +static void DrawTileLayout(const TileInfo *ti, const TileLayoutSpriteGroup *group, byte stage, HouseID house_id) { - const DrawTileSprites *dts = group->g.layout.dts; + const DrawTileSprites *dts = group->dts; const DrawTileSeqStruct *dtss; const HouseSpec *hs = GetHouseSpecs(house_id); @@ -427,10 +427,11 @@ void DrawNewHouseTile(TileInfo *ti, HouseID house_id) /* XXX: This is for debugging purposes really, and shouldn't stay. */ DrawGroundSprite(SPR_SHADOW_CELL, PAL_NONE); } else { + const TileLayoutSpriteGroup *tlgroup = (const TileLayoutSpriteGroup *)group; /* Limit the building stage to the number of stages supplied. */ byte stage = GetHouseBuildingStage(ti->tile); - stage = Clamp(stage - 4 + group->g.layout.num_sprites, 0, group->g.layout.num_sprites - 1); - DrawTileLayout(ti, group, stage, house_id); + stage = Clamp(stage - 4 + tlgroup->num_sprites, 0, tlgroup->num_sprites - 1); + DrawTileLayout(ti, tlgroup, stage, house_id); } } |