openttd-mini: comparison rail

equal deleted inserted replaced

-:0811adaec525
+:eeaefdabfdfd
 		return i + 15;
 	return 0;
 }
-//
 static uint32 CheckRailSlope(uint tileh, TrackBits rail_bits, TrackBits existing, TileIndex tile)
 {
 	// never allow building on top of steep tiles
 	if (!IsSteepTileh(tileh)) {
 		rail_bits |= existing;
 	ret = DoCommandByTile(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 	if (CmdFailed(ret)) return CMD_ERROR;
 	cost = ret;
 	d = AllocateDepot();
-	if (d == NULL)
+	if (d == NULL) return CMD_ERROR;
-		return CMD_ERROR;
 	if (flags & DC_EXEC) {
 		if (IsLocalPlayer()) _last_built_train_depot_tile = tile;
 		ModifyTile(tile,
 			/* If CmdBuildManySignals is called with copying signals, just copy the
 			 * direction of the first signal given as parameter by CmdBuildManySignals */
 			_m[tile].m3 &= ~SignalOnTrack(track);
 			_m[tile].m3 |= p2 & SignalOnTrack(track);
 			// convert between signal<->semaphores when dragging
-			if (semaphore)
+			if (semaphore) {
 				SETBIT(_m[tile].m4, 3);
-			else
+			} else {
 				CLRBIT(_m[tile].m4, 3);
+			}
 		}
 		MarkTileDirtyByTile(tile);
 		SetSignalsOnBothDir(tile, track);
 	}
 	byte signal_density = (p2 >> 24);
 	if (p1 > MapSize()) return CMD_ERROR;
 	if (signal_density == 0 || signal_density > 20) return CMD_ERROR;
-	if (!IsTileType(tile, MP_RAILWAY))
+	if (!IsTileType(tile, MP_RAILWAY)) return CMD_ERROR;
-		return CMD_ERROR;
 	SET_EXPENSES_TYPE(EXPENSES_CONSTRUCTION);
 	/* for vertical/horizontal tracks, double the given signals density
 	* since the original amount will be too dense (shorter tracks) */
 }
 static void DrawTrackFence_NS_1(const TileInfo *ti)
 {
 	int z = ti->z;
-	if (ti->tileh & 1)
+	if (ti->tileh & 1) z += 8;
-		z += 8;
 	AddSortableSpriteToDraw(0x517 | _drawtile_track_palette,
 		ti->x + 8, ti->y + 8, 1, 1, 4, z);
 }
 static void DrawTrackFence_NS_2(const TileInfo *ti)
 {
 	int z = ti->z;
-	if (ti->tileh & 4)
+	if (ti->tileh & 4) z += 8;
-		z += 8;
 	AddSortableSpriteToDraw(0x517 | _drawtile_track_palette,
 		ti->x + 8, ti->y + 8, 1, 1, 4, z);
 }
 static void DrawTrackFence_WE_1(const TileInfo *ti)
 {
 	int z = ti->z;
-	if (ti->tileh & 8)
+	if (ti->tileh & 8) z += 8;
-		z += 8;
 	AddSortableSpriteToDraw(0x518 | _drawtile_track_palette,
 		ti->x + 8, ti->y + 8, 1, 1, 4, z);
 }
 static void DrawTrackFence_WE_2(const TileInfo *ti)
 {
 	int z = ti->z;
-	if (ti->tileh & 2)
+	if (ti->tileh & 2) z += 8;
-		z += 8;
 	AddSortableSpriteToDraw(0x518 | _drawtile_track_palette,
 		ti->x + 8, ti->y + 8, 1, 1, 4, z);
 }
 static void DetTrackDrawProc_Null(const TileInfo *ti)
 	ssd->stop = false;
 	/* Go through all the PF tiles */
 	for (i = 0; i < lengthof(tpf->hash_head); i++) {
 		/* Empty hash item */
-		if (tpf->hash_head[i] == 0)
+		if (tpf->hash_head[i] == 0) continue;
-			continue;
 		/* If 0x8000 is not set, there is only 1 item */
 		if (!(tpf->hash_head[i] & 0x8000)) {
 			/* Check if there is a vehicle on this tile */
 			if (SignalVehicleCheck(tpf->hash_tile[i], tpf->hash_head[i])) {
 		// remember the result only for the first iteration.
 		if (result < 0) result = ssd.stop;
 		// if any exit signals were changed, we need to keep going to modify the stuff behind those.
-		if(!ssd.cur_stack)
+		if (ssd.cur_stack == 0) break;
-			break;
 		// one or more exit signals were changed, so we need to update another segment too.
 		tile = ssd.next_tile[--ssd.cur_stack];
 		direction = ssd.next_dir[ssd.cur_stack];
 	}
 			}
 			break;
 	}
 	// Don't continue tile loop for depots
-	if (_m[tile].m5 & RAIL_TYPE_SPECIAL)
+	if (_m[tile].m5 & RAIL_TYPE_SPECIAL) return;
-		return;
 	a2 = RAIL_GROUND_GREEN;
 	if (m2 != RAIL_GROUND_BROWN) { /* wait until bottom is green */
 		/* determine direction of fence */
 {
 	byte m5, a;
 	uint16 b;
 	uint32 ret;
-	if (mode != TRANSPORT_RAIL)
+	if (mode != TRANSPORT_RAIL) return 0;
-		return 0;
 	m5 = _m[tile].m5;
 	if (!(m5 & RAIL_TYPE_SPECIAL)) {
 		ret = (m5 | (m5 << 8)) & 0x3F3F;
 			 * signals are only one way, the other way will
 			 * implicitely become `red' */
 			if ((a & 0xC0) == 0) b |= 0xC0;
 			if ((a & 0x30) == 0) b |= 0x30;
-			if ( (b & 0x80) == 0)	ret |= 0x10070000;
+			if ((b & 0x80) == 0) ret |= 0x10070000;
-			if ( (b & 0x40) == 0)	ret |= 0x7100000;
+			if ((b & 0x40) == 0) ret |= 0x07100000;
-			if ( (b & 0x20) == 0)	ret |= 0x20080000;
+			if ((b & 0x20) == 0) ret |= 0x20080000;
-			if ( (b & 0x10) == 0)	ret |= 0x8200000;
+			if ((b & 0x10) == 0) ret |= 0x08200000;
 		}
 	} else if (m5 & 0x40) {
 		static const byte _train_spec_tracks[6] = {1,2,1,2,1,2};
 		m5 = _train_spec_tracks[m5 & 0x3F];
 		ret = (m5 << 8) + m5;
 	byte fract_coord_leave;
 	int dir;
 	int length;
 	// this routine applies only to trains in depot tiles
-	if (v->type != VEH_Train || !IsTileDepotType(tile, TRANSPORT_RAIL))
+	if (v->type != VEH_Train || !IsTileDepotType(tile, TRANSPORT_RAIL)) return 0;
-		return 0;
 	/* depot direction */
 	dir = GetDepotDirection(tile, TRANSPORT_RAIL);
 	/* calculate the point where the following wagon should be activated */

changeset 2639	eeaefdabfdfd
parent 2631	2ed0eb408229
child 2642	1d79b44ccbc9