Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r22560) -Codechange: Remove constness from House in ResolverObject.

Browse Source
pull/155/head
terkhen 13 years ago
parent 431fba8852
commit 92c429e3ee
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

4
src/newgrf_house.cpp
Unescape Escape View File

@ -365,7 +365,7 @@ static const SpriteGroup *HouseResolveReal(const ResolverObject *object, const R
* *
* Returns a resolver object to be used with feature 07 spritegroups. * 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->GetRandomBits = HouseGetRandomBits;
res->GetTriggers = HouseGetTriggers; 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); 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; ResolverObject object;
const SpriteGroup *group; const SpriteGroup *group;

2
src/newgrf_house.h
Unescape Escape View File

@ -44,7 +44,7 @@ void DrawNewHouseTile(TileInfo *ti, HouseID house_id);
void AnimateNewHouseTile(TileIndex tile); void AnimateNewHouseTile(TileIndex tile);
void AnimateNewHouseConstruction(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); bool CanDeleteHouse(TileIndex tile);

2
src/newgrf_spritegroup.h
Unescape Escape View File

@ -336,7 +336,7 @@ struct ResolverObject {
} station; } station;
struct { struct {
TileIndex tile; TileIndex tile;
const Town *town; Town *town; ///< Town of this house
HouseID house_id; HouseID house_id;
uint16 initial_random_bits; ///< Random bits during construction checks uint16 initial_random_bits; ///< Random bits during construction checks
bool not_yet_constructed; ///< True for construction check bool not_yet_constructed; ///< True for construction check

Write Preview
Loading…
Cancel
Save