cpp/openttd-patchpack/source Changeset - r17764:e13d0288c811

Changeset - r17764:e13d0288c811

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

terkhen - 13 years ago 2011-06-12 20:34:37
terkhen@openttd.org

(svn r22559) -Codechange: Remove constness from Station in ResolverObject.

3 files changed with 3 insertions and 3 deletions:

src/newgrf_airporttiles.cpp

src/newgrf_spritegroup.h

src/newgrf_station.h

0 comments (0 inline, 0 general)

src/newgrf_airporttiles.cpp

➞

Show inline comments

@@ @@ -218,13 +218,13 @@ static uint32 AirportTileGetRandomBits(c @@
+{
 	const Station *st = object->u.airport.st;
 	const TileIndex tile = object->u.airport.tile;
 	return (st == NULL ? 0 : st->random_bits) | (tile == INVALID_TILE ? 0 : GetStationTileRandomBits(tile) << 16);
+}
-static void AirportTileResolver(ResolverObject *res, const AirportTileSpec *ats, TileIndex tile, const Station *st)
 static void AirportTileResolver(ResolverObject *res, const AirportTileSpec *ats, TileIndex tile, Station *st)
+{
 	res->GetRandomBits = AirportTileGetRandomBits;
 	res->GetTriggers   = NULL;
 	res->SetTriggers   = NULL;
 	res->GetVariable   = AirportTileGetVariable;
 	res->ResolveReal   = AirportTileResolveReal;

src/newgrf_spritegroup.h

➞

Show inline comments

@@ @@ -362,13 +362,13 @@ struct ResolverObject { @@
 		} generic;
 		struct {
 			TileIndex tile;                ///< Tracktile. For track on a bridge this is the southern bridgehead.
 			TileContext context;           ///< Are we resolving sprites for the upper halftile, or on a bridge?
 		} routes;
 		struct {
-			const struct Station *st;      ///< Station of the airport for which the callback is run, or NULL for build gui.
+			struct Station *st;            ///< Station of the airport for which the callback is run, or NULL for build gui.
 			byte airport_id;               ///< Type of airport for which the callback is run
 			byte layout;                   ///< Layout of the airport to build.
 			TileIndex tile;                ///< Tile for the callback, only valid for airporttile callbacks.
 		} airport;
 		struct {
 			const struct Object *o;        ///< The object the callback is ran for.

src/newgrf_station.h

➞

Show inline comments

@@ @@ -109,13 +109,13 @@ typedef NewGRFClass<StationSpec, Station @@
 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, BaseStation *st, TileIndex tile, uint32 var10 = 0);
-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);
 uint16 GetStationCallback(CallbackID callback, uint32 param1, uint32 param2, const StationSpec *statspec, BaseStation *st, TileIndex tile);
 /* Allocate a StationSpec to a Station. This is called once per build operation. */
 int AllocateSpecToStation(const StationSpec *statspec, BaseStation *st, bool exec);
 /* Deallocate a StationSpec from a Station. Called when removing a single station tile. */

0 comments (0 inline, 0 general)