diff options
| author | terkhen <terkhen@openttd.org> | 2011-06-12 20:34:03 +0000 |
|---|---|---|
| committer | terkhen <terkhen@openttd.org> | 2011-06-12 20:34:03 +0000 |
| commit | c98a8308cc1d0e820a96b618bdd2045580f1e173 (patch) | |
| tree | 09f8872a2e0a37b2923953dc17438074c72606bf /src | |
| parent | e127fca384892a22a393fe68c88d9291c5c1d18c (diff) | |
| download | openttd-c98a8308cc1d0e820a96b618bdd2045580f1e173.tar.xz | |
(svn r22558) -Codechange: Remove constness from BaseStation in ResolverObject.
Diffstat (limited to 'src')
| -rw-r--r-- | src/newgrf_spritegroup.h | 2 | ||||
| -rw-r--r-- | src/newgrf_station.cpp | 6 | ||||
| -rw-r--r-- | src/newgrf_station.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/newgrf_spritegroup.h b/src/newgrf_spritegroup.h index 3a13a3bbe..f95dd3748 100644 --- a/src/newgrf_spritegroup.h +++ b/src/newgrf_spritegroup.h @@ -330,7 +330,7 @@ struct ResolverObject { } canal; struct { TileIndex tile; - const struct BaseStation *st; + struct BaseStation *st; const struct StationSpec *statspec; CargoID cargo_type; } station; diff --git a/src/newgrf_station.cpp b/src/newgrf_station.cpp index 00b4d5f97..83fca3d24 100644 --- a/src/newgrf_station.cpp +++ b/src/newgrf_station.cpp @@ -517,7 +517,7 @@ static const SpriteGroup *StationResolveReal(const ResolverObject *object, const } -static void NewStationResolver(ResolverObject *res, const StationSpec *statspec, const BaseStation *st, TileIndex tile) +static void NewStationResolver(ResolverObject *res, const StationSpec *statspec, BaseStation *st, TileIndex tile) { res->GetRandomBits = StationGetRandomBits; res->GetTriggers = StationGetTriggers; @@ -585,7 +585,7 @@ static const SpriteGroup *ResolveStation(ResolverObject *object) * @param var10 Value to put in variable 10; normally 0; 1 when resolving the groundsprite and SSF_SEPARATE_GROUND is set. * @return First sprite of the Action 1 spriteset ot use, minus an offset of 0x42D to accommodate for weird NewGRF specs. */ -SpriteID GetCustomStationRelocation(const StationSpec *statspec, const BaseStation *st, TileIndex tile, uint32 var10) +SpriteID GetCustomStationRelocation(const StationSpec *statspec, BaseStation *st, TileIndex tile, uint32 var10) { const SpriteGroup *group; ResolverObject object; @@ -607,7 +607,7 @@ SpriteID GetCustomStationRelocation(const StationSpec *statspec, const BaseStati * @param edge_info Information about northern tile edges; whether they need foundations or merge into adjacent tile's foundations. * @return First sprite of a set of foundation sprites for various slopes. */ -SpriteID GetCustomStationFoundationRelocation(const StationSpec *statspec, const BaseStation *st, TileIndex tile, uint layout, uint edge_info) +SpriteID GetCustomStationFoundationRelocation(const StationSpec *statspec, BaseStation *st, TileIndex tile, uint layout, uint edge_info) { const SpriteGroup *group; ResolverObject object; diff --git a/src/newgrf_station.h b/src/newgrf_station.h index e1da520c9..fe924d51d 100644 --- a/src/newgrf_station.h +++ b/src/newgrf_station.h @@ -111,7 +111,7 @@ const StationSpec *GetStationSpec(TileIndex t); /* Evaluate a tile's position within a station, and return the result a bitstuffed format. */ uint32 GetPlatformInfo(Axis axis, byte tile, int platforms, int length, int x, int y, bool centred); -SpriteID GetCustomStationRelocation(const StationSpec *statspec, const BaseStation *st, TileIndex tile, uint32 var10 = 0); +SpriteID GetCustomStationRelocation(const StationSpec *statspec, BaseStation *st, TileIndex tile, uint32 var10 = 0); SpriteID GetCustomStationFoundationRelocation(const StationSpec *statspec, const BaseStation *st, TileIndex tile, uint layout, uint edge_info); uint16 GetStationCallback(CallbackID callback, uint32 param1, uint32 param2, const StationSpec *statspec, BaseStation *st, TileIndex tile); |