Mercurial > hg > openttd

changeset 4081:26f90162a4bf draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r5396) - Remove two fixed parameters - Simplify an expresssion: c ? f(x) : f(y) -> f(c ? x : y)
author tron <tron@openttd.org>
date Wed, 28 Jun 2006 06:10:20 +0000
parents 1239c5c400ac
children 58f129998bf2
files pathfind.c rail_cmd.c road_cmd.c
diffstat 3 files changed, 7 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/pathfind.c
+++ b/pathfind.c
@@ -756,7 +756,7 @@
 
 				/* Check the rail type only if the train is *NOT* on top of a bridge. */
 				if (!(IsBridgeTile(tile) && IsBridgeMiddle(tile) && GetBridgeAxis(tile) == DiagDirToAxis(direction))) {
-					if (IsTileType(tile, MP_STREET) ? !HASBIT(tpf->railtypes, GetRailTypeCrossing(tile)) : !HASBIT(tpf->railtypes, GetRailType(tile))) {
+					if (!HASBIT(tpf->railtypes, IsTileType(tile, MP_STREET) ? GetRailTypeCrossing(tile) : GetRailType(tile))) {
 						bits = 0;
 						break;
 					}
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -1205,7 +1205,7 @@
  * @param snow Draw as snow
  * @param flat Always draw foundation
  */
-static void DrawTrackBits(TileInfo* ti, TrackBits track, bool flat)
+static void DrawTrackBits(TileInfo* ti, TrackBits track)
 {
 	const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
 	PalSpriteID image;
@@ -1233,13 +1233,7 @@
 	(image++, true);
 
 	if (ti->tileh != SLOPE_FLAT) {
-		int foundation;
-
-		if (flat) {
-			foundation = ti->tileh;
-		} else {
-			foundation = GetRailFoundation(ti->tileh, track);
-		}
+		uint foundation = GetRailFoundation(ti->tileh, track);
 
 		if (foundation != 0) DrawFoundation(ti, foundation);
 
@@ -1313,7 +1307,7 @@
 	if (GetRailTileType(ti->tile) != RAIL_TILE_DEPOT_WAYPOINT) {
 		TrackBits rails = GetTrackBits(ti->tile);
 
-		DrawTrackBits(ti, rails, false);
+		DrawTrackBits(ti, rails);
 
 		if (_display_opt & DO_FULL_DETAIL) DrawTrackDetails(ti);
 
--- a/road_cmd.c
+++ b/road_cmd.c
@@ -696,8 +696,9 @@
  * @param ti TileInfo
  * @param road RoadBits to draw
  */
-static void DrawRoadBits(TileInfo* ti, RoadBits road)
+static void DrawRoadBits(TileInfo* ti)
 {
+	RoadBits road = GetRoadBits(ti->tile);
 	const DrawRoadTileStruct *drts;
 	PalSpriteID image = 0;
 	Roadside roadside;
@@ -752,7 +753,7 @@
 {
 	switch (GetRoadTileType(ti->tile)) {
 		case ROAD_TILE_NORMAL:
-			DrawRoadBits(ti, GetRoadBits(ti->tile));
+			DrawRoadBits(ti);
 			break;
 
 		case ROAD_TILE_CROSSING: {