cpp/openttd-patchpack/source Changeset - r3741:8dc6982326a9

Changeset - r3741:8dc6982326a9

Parent rev.

Child rev.

[Not reviewed]

master

0 5 0

peter1138 - 18 years ago 2006-05-03 21:19:21
peter1138@openttd.org

(svn r4723) - Newstations: add TileIndex parameter to station resolver.

5 files changed with 5 insertions and 5 deletions:

newgrf_station.c

newgrf_station.h

rail_cmd.c

station_cmd.c

waypoint.c

0 comments (0 inline, 0 general)

newgrf_station.c

➞

Show inline comments

@@ @@ -225,7 +225,7 @@ static const RealSpriteGroup *ResolveSta @@
+	}
+}
-uint32 GetCustomStationRelocation(const StationSpec *statspec, const Station *st, byte ctype)
+SpriteID GetCustomStationRelocation(const StationSpec *statspec, const Station *st, TileIndex tile, byte ctype)
+{
 	const RealSpriteGroup *rsg = ResolveStationSpriteGroup(statspec->spritegroup[ctype], st);
 	if (rsg == NULL) return 0;

newgrf_station.h

➞

Show inline comments

@@ @@ -98,7 +98,7 @@ const StationSpec *GetCustomStationSpec( @@
 /* 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. */
-uint32 GetCustomStationRelocation(const StationSpec *statspec, const Station *st, byte ctype);
+SpriteID GetCustomStationRelocation(const StationSpec *statspec, const Station *st, TileIndex tile, byte ctype);
 /* Allocate a StationSpec to a Station. This is called once per build operation. */
 int AllocateSpecToStation(const StationSpec *statspec, Station *st, bool exec);

rail_cmd.c

➞

Show inline comments

@@ @@ -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), 0);
+				uint32 relocation = GetCustomStationRelocation(statspec, ComposeWaypointStation(ti->tile), ti->tile, 0);
 				/* We don't touch the 0x8000 bit. In all this
 				 * waypoint code, it is used to indicate that

station_cmd.c

➞

Show inline comments

@@ @@ -1989,7 +1989,7 @@ static void DrawTile_Station(TileInfo *t @@
 		if (statspec != NULL) {
 			uint tile = GetStationGfx(ti->tile);
 			relocation = GetCustomStationRelocation(statspec, st, 0);
+			relocation = GetCustomStationRelocation(statspec, st, ti->tile, 0);
 			/* Ensure the chosen tile layout is valid for this custom station */
 			t = &statspec->renderdata[tile < statspec->tiles ? tile : GetRailStationAxis(ti->tile)];

waypoint.c

➞

Show inline comments

@@ @@ -405,7 +405,7 @@ void DrawWaypointSprite(int x, int y, in @@
 		return;
+	}
 	relocation = GetCustomStationRelocation(statspec, NULL, 1);
+	relocation = GetCustomStationRelocation(statspec, NULL, INVALID_TILE, 1);
 	// emulate station tile - open with building
 	// add 1 to get the other direction
 	cust = &statspec->renderdata[2];

0 comments (0 inline, 0 general)