(svn r4739) - Newstations: remove cargo type parameter of GetCustomStationRelocation() as we can determine it internally
authorpeter1138
Thu, 04 May 2006 19:21:16 +0000
changeset 3751 785501c18d0d
parent 3750 a8600490f8fc
child 3752 a7cdd7c0c928
(svn r4739) - Newstations: remove cargo type parameter of GetCustomStationRelocation() as we can determine it internally
newgrf_station.c
newgrf_station.h
rail_cmd.c
station_cmd.c
waypoint.c
--- a/newgrf_station.c	Thu May 04 19:15:02 2006 +0000
+++ b/newgrf_station.c	Thu May 04 19:21:16 2006 +0000
@@ -323,11 +323,11 @@
 }
 
 
-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);
 
--- a/newgrf_station.h	Thu May 04 19:15:02 2006 +0000
+++ b/newgrf_station.h	Thu May 04 19:21:16 2006 +0000
@@ -96,9 +96,9 @@
 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);
--- a/rail_cmd.c	Thu May 04 19:15:02 2006 +0000
+++ b/rail_cmd.c	Thu May 04 19:21:16 2006 +0000
@@ -1324,7 +1324,7 @@
 				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
--- a/station_cmd.c	Thu May 04 19:15:02 2006 +0000
+++ b/station_cmd.c	Thu May 04 19:21:16 2006 +0000
@@ -1990,7 +1990,7 @@
 		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)];
--- a/waypoint.c	Thu May 04 19:15:02 2006 +0000
+++ b/waypoint.c	Thu May 04 19:21:16 2006 +0000
@@ -405,7 +405,7 @@
 		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];