diff options
| author | terkhen <terkhen@openttd.org> | 2011-06-12 20:35:37 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2011-06-12 20:35:37 +0000 |
| commit | 76cd19f84608c134f642bca4e303f4b7370c7017 (patch) | |
| tree | 0587313cfa9e64702da6b2bd16c2f89a86478942 | |
| parent | e8df5563dbf171aa5953a31d71cf30d42bbf4162 (diff) | |
| download | openttd-76cd19f84608c134f642bca4e303f4b7370c7017.tar.xz | |
(svn r22560) -Codechange: Remove constness from House in ResolverObject.
| -rw-r--r-- | src/newgrf_house.cpp | 4 | ||||
| -rw-r--r-- | src/newgrf_house.h | 2 | ||||
| -rw-r--r-- | src/newgrf_spritegroup.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/newgrf_house.cpp b/src/newgrf_house.cpp index d267ff1f2..779f6cd3f 100644 --- a/src/newgrf_house.cpp +++ b/src/newgrf_house.cpp @@ -365,7 +365,7 @@ static const SpriteGroup *HouseResolveReal(const ResolverObject *object, const R * * Returns a resolver object to be used with feature 07 spritegroups. */ -static void NewHouseResolver(ResolverObject *res, HouseID house_id, TileIndex tile, const Town *town) +static void NewHouseResolver(ResolverObject *res, HouseID house_id, TileIndex tile, Town *town) { res->GetRandomBits = HouseGetRandomBits; res->GetTriggers = HouseGetTriggers; @@ -390,7 +390,7 @@ static void NewHouseResolver(ResolverObject *res, HouseID house_id, TileIndex ti res->grffile = (hs != NULL ? hs->grf_prop.grffile : NULL); } -uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, const Town *town, TileIndex tile, bool not_yet_constructed, uint8 initial_random_bits) +uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, Town *town, TileIndex tile, bool not_yet_constructed, uint8 initial_random_bits) { ResolverObject object; const SpriteGroup *group; diff --git a/src/newgrf_house.h b/src/newgrf_house.h index 1b24a6747..62748ec82 100644 --- a/src/newgrf_house.h +++ b/src/newgrf_house.h @@ -44,7 +44,7 @@ void DrawNewHouseTile(TileInfo *ti, HouseID house_id); void AnimateNewHouseTile(TileIndex tile); void AnimateNewHouseConstruction(TileIndex tile); -uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, const Town *town, TileIndex tile, bool not_yet_constructed = false, uint8 initial_random_bits = 0); +uint16 GetHouseCallback(CallbackID callback, uint32 param1, uint32 param2, HouseID house_id, Town *town, TileIndex tile, bool not_yet_constructed = false, uint8 initial_random_bits = 0); bool CanDeleteHouse(TileIndex tile); diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index f65a7f5c4..c05031cca 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -336,7 +336,7 @@ struct ResolverObject { } station; struct { TileIndex tile; - const Town *town; + Town *town; ///< Town of this house HouseID house_id; uint16 initial_random_bits; ///< Random bits during construction checks bool not_yet_constructed; ///< True for construction check |