diff --git a/newgrf_station.c b/newgrf_station.c index ab6d2fc591..a0a82df0bc 100644 --- a/newgrf_station.c +++ b/newgrf_station.c @@ -323,11 +323,11 @@ static void NewStationResolver(ResolverObject *res, const StationSpec *statspec, } -SpriteID GetCustomStationRelocation(const StationSpec *statspec, const Station *st, TileIndex tile, CargoID ctype) +SpriteID GetCustomStationRelocation(const StationSpec *statspec, const Station *st, TileIndex tile) { const SpriteGroup *group; ResolverObject object; - ctype = (st == NULL) ? GC_PURCHASE : GC_DEFAULT_NA; + CargoID ctype = (st == NULL) ? GC_PURCHASE : GC_DEFAULT_NA; NewStationResolver(&object, statspec, st, tile); diff --git a/newgrf_station.h b/newgrf_station.h index 6680334ac1..d14d215d8c 100644 --- a/newgrf_station.h +++ b/newgrf_station.h @@ -96,9 +96,9 @@ void SetCustomStationSpec(StationSpec *statspec); const StationSpec *GetCustomStationSpec(StationClassID sclass, uint station); /* Get sprite offset for a given custom station and station structure (may be - * NULL if ctype is set - that means we are in a build dialog). The station - * structure is used for variational sprite groups. */ -SpriteID GetCustomStationRelocation(const StationSpec *statspec, const Station *st, TileIndex tile, CargoID ctype); + * NULL - that means we are in a build dialog). The station structure is used + * for variational sprite groups. */ +SpriteID GetCustomStationRelocation(const StationSpec *statspec, const Station *st, TileIndex tile); /* Allocate a StationSpec to a Station. This is called once per build operation. */ int AllocateSpecToStation(const StationSpec *statspec, Station *st, bool exec); diff --git a/rail_cmd.c b/rail_cmd.c index 34ba583096..fdadfddfeb 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -1324,7 +1324,7 @@ static void DrawTile_Track(TileInfo *ti) DrawTileSeqStruct const *seq; // emulate station tile - open with building const DrawTileSprites *cust = &statspec->renderdata[2 + GetWaypointAxis(ti->tile)]; - uint32 relocation = GetCustomStationRelocation(statspec, ComposeWaypointStation(ti->tile), ti->tile, 0); + uint32 relocation = GetCustomStationRelocation(statspec, ComposeWaypointStation(ti->tile), ti->tile); /* We don't touch the 0x8000 bit. In all this * waypoint code, it is used to indicate that diff --git a/station_cmd.c b/station_cmd.c index 8fd4d62d5d..b488fa2126 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -1990,7 +1990,7 @@ static void DrawTile_Station(TileInfo *ti) if (statspec != NULL) { uint tile = GetStationGfx(ti->tile); - relocation = GetCustomStationRelocation(statspec, st, ti->tile, 0); + relocation = GetCustomStationRelocation(statspec, st, ti->tile); /* Ensure the chosen tile layout is valid for this custom station */ t = &statspec->renderdata[tile < statspec->tiles ? tile : GetRailStationAxis(ti->tile)]; diff --git a/waypoint.c b/waypoint.c index 8e363ea5fd..e4fef4ab7f 100644 --- a/waypoint.c +++ b/waypoint.c @@ -405,7 +405,7 @@ void DrawWaypointSprite(int x, int y, int stat_id, RailType railtype) return; } - relocation = GetCustomStationRelocation(statspec, NULL, INVALID_TILE, 1); + relocation = GetCustomStationRelocation(statspec, NULL, INVALID_TILE); // emulate station tile - open with building // add 1 to get the other direction cust = &statspec->renderdata[2];