cpp/openttd-patchpack/source Changeset - r3527:d68d91114a0c

Changeset - r3527:d68d91114a0c

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

peter1138 - 19 years ago 2006-04-12 12:33:21
peter1138@openttd.org

(svn r4383) - Codechange: Remove extraneous code from 4354; no need to get RailTypeInfo when we already have it...

3 files changed with 3 insertions and 3 deletions:

rail_cmd.c

station_cmd.c

waypoint.c

0 comments (0 inline, 0 general)

rail_cmd.c

➞

Show inline comments

@@ @@ -1326,13 +1326,13 @@ static void DrawTile_Track(TileInfo *ti) @@
 				 * for station sprites. And in the drawing
 				 * code, it is used to indicate that the sprite
 				 * should be drawn in company colors, and it's
 				 * up to the GRF file to decide that. */
 				image = cust->ground_sprite;
-				image += (image < _custom_sprites_base) ? rti->total_offset : GetRailTypeInfo(GetRailType(ti->tile))->custom_ground_offset;
+				image += (image < _custom_sprites_base) ? rti->total_offset : rti->custom_ground_offset;
 				DrawGroundSprite(image);
 				if (GetRailType(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti);
 				foreach_draw_tile_seq(seq, cust->seq) {

station_cmd.c

➞

Show inline comments

@@ @@ -1952,13 +1952,13 @@ static void DrawTile_Station(TileInfo *t @@
 	if (t == NULL) t = &_station_display_datas[GetStationGfx(ti->tile)];
 	image = t->ground_sprite;
 	if (image & PALETTE_MODIFIER_COLOR) image |= image_or_modificator;
 	// For custom sprites, there's no railtype-based pitching.
-	offset = (image & SPRITE_MASK) < _custom_sprites_base ? rti->total_offset : GetRailTypeInfo(railtype)->custom_ground_offset;
+	offset = (image & SPRITE_MASK) < _custom_sprites_base ? rti->total_offset : rti->custom_ground_offset;
 	image += offset;
 	// station_land array has been increased from 82 elements to 114
 	// but this is something else. If AI builds station with 114 it looks all weird
 	DrawGroundSprite(image);

waypoint.c

➞

Show inline comments

@@ @@ -409,13 +409,13 @@ void DrawWaypointSprite(int x, int y, in @@
 	relocation = GetCustomStationRelocation(stat, NULL, 1);
 	// emulate station tile - open with building
 	// add 1 to get the other direction
 	cust = &stat->renderdata[2];
 	img = cust->ground_sprite;
-	img += (img < _custom_sprites_base) ? rti->total_offset : GetRailTypeInfo(railtype)->custom_ground_offset;
+	img += (img < _custom_sprites_base) ? rti->total_offset : rti->custom_ground_offset;
 	if (img & PALETTE_MODIFIER_COLOR) img = (img & SPRITE_MASK);
 	DrawSprite(img, x, y);
 	foreach_draw_tile_seq(seq, cust->seq) {
 		Point pt = RemapCoords(seq->delta_x, seq->delta_y, seq->delta_z);

0 comments (0 inline, 0 general)