diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-23 15:25:52 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-23 15:25:52 +0000 |
| commit | f2317d0d9d74c3f5d14530c14b314ad32d05ef80 (patch) | |
| tree | fa8a51810dfc5e6bb93d389b67c2815ce1d90967 /src/newgrf_house.cpp | |
| parent | 8d072585aecc4ff35c922f482d99aef194e0a311 (diff) | |
| download | openttd-f2317d0d9d74c3f5d14530c14b314ad32d05ef80.tar.xz | |
(svn r16402) -Codechange: make Resolve a function of SpriteGroup
Diffstat (limited to 'src/newgrf_house.cpp')
| -rw-r--r-- | src/newgrf_house.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index f49da4603..f1585f97e 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -354,7 +354,7 @@ uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, House object.callback_param1 = param1; object.callback_param2 = param2; - group = Resolve(GetHouseSpecs(house_id)->spritegroup, &object); + group = SpriteGroup::Resolve(GetHouseSpecs(house_id)->spritegroup, &object); if (group == NULL) return CALLBACK_FAILED; return group->GetCallbackResult(); @@ -422,7 +422,7 @@ void DrawNewHouseTile(TileInfo *ti, HouseID house_id) NewHouseResolver(&object, house_id, ti->tile, GetTownByTile(ti->tile)); - group = Resolve(hs->spritegroup, &object); + group = SpriteGroup::Resolve(hs->spritegroup, &object); if (group == NULL || group->type != SGT_TILELAYOUT) { /* XXX: This is for debugging purposes really, and shouldn't stay. */ DrawGroundSprite(SPR_SHADOW_CELL, PAL_NONE); @@ -601,7 +601,7 @@ static void DoTriggerHouse(TileIndex tile, HouseTrigger trigger, byte base_rando object.callback = CBID_RANDOM_TRIGGER; object.trigger = trigger; - const SpriteGroup *group = Resolve(hs->spritegroup, &object); + const SpriteGroup *group = SpriteGroup::Resolve(hs->spritegroup, &object); if (group == NULL) return; byte new_random_bits = Random(); |