cpp/openttd-patchpack/source Changeset - r12956:a282d58c4ea9

Changeset - r12956:a282d58c4ea9

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

rubidium - 15 years ago 2009-09-07 18:35:38
rubidium@openttd.org

(svn r17460) -Feature: allow building rail stations over existing rail without signals but will upgrade normal rail to electrified rail if necessary (based on patch by laurijh)

2 files changed with 27 insertions and 4 deletions:

src/station_cmd.cpp

src/unmovable_cmd.cpp

0 comments (0 inline, 0 general)

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -659,13 +659,13 @@ CommandCost ClearTile_Station(TileIndex @@
  * @param flags operation to perform
  * @param invalid_dirs prohibited directions (set of DiagDirections)
  * @param station StationID to be queried and returned if available
  * @param check_clear if clearing tile should be performed (in wich case, cost will be added)
  * @return the cost in case of success, or an error code if it failed.
  */
 CommandCost CheckFlatLandBelow(TileIndex tile, uint w, uint h, DoCommandFlag flags, uint invalid_dirs, StationID *station, bool check_clear = true)
+CommandCost CheckFlatLandBelow(TileIndex tile, uint w, uint h, DoCommandFlag flags, uint invalid_dirs, StationID *station, bool check_clear = true, RailType rt = INVALID_RAILTYPE)
+{
 	CommandCost cost(EXPENSES_CONSTRUCTION);
 	int allowed_z = -1;
 	TILE_LOOP(tile_cur, w, h, tile) {
 		if (MayHaveBridgeAbove(tile_cur) && IsBridgeAbove(tile_cur)) {
@@ @@ -720,12 +720,35 @@ CommandCost CheckFlatLandBelow(TileIndex @@
 					*station = st;
 				} else if (*station != st) {
 					return_cmd_error(STR_ERROR_ADJOINS_MORE_THAN_ONE_EXISTING);
+				}
+			}
 		} else if (check_clear) {
 			/* Rail type is only valid when building a railway station; in station to
 			 * build isn't a rail station it's INVALID_RAILTYPE. */
 			if (rt != INVALID_RAILTYPE &&
 					IsPlainRailTile(tile_cur) && !HasSignals(tile_cur) &&
 					HasPowerOnRail(GetRailType(tile), rt)) {
 				/* Allow overbuilding if the tile:
 				 *  - has rail, but no signals
 				 *  - it has exactly one track
 				 *  - the track is in line with the station
 				 *  - the current rail type has power on the to-be-built type (e.g. convert normal rail to el rail)
 				 */
 				TrackBits tracks = GetTrackBits(tile_cur);
 				Track track = RemoveFirstTrack(&tracks);
 				Track expected_track = HasBit(invalid_dirs, DIAGDIR_NE) ? TRACK_X : TRACK_Y;
 				if (tracks == TRACK_BIT_NONE && track == expected_track) {
 					CommandCost ret = DoCommand(tile_cur, 0, track, flags, CMD_REMOVE_SINGLE_RAIL);
 					if (CmdFailed(ret)) return ret;
 					cost.AddCost(ret);
 					/* With flags & ~DC_EXEC CmdLandscapeClear would fail since the rail still exists */
 					continue;
+				}
+			}
 			CommandCost ret = DoCommand(tile_cur, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
 			if (CmdFailed(ret)) return ret;
 			cost.AddCost(ret);
+		}
+	}
@@ @@ -972,13 +995,13 @@ CommandCost CmdBuildRailStation(TileInde @@
 	/* Make sure the area below consists of clear tiles. (OR tiles belonging to a certain rail station) */
 	StationID est = INVALID_STATION;
 	/* If DC_EXEC is in flag, do not want to pass it to CheckFlatLandBelow, because of a nice bug
 	 * for detail info, see:
 	 * https://sourceforge.net/tracker/index.php?func=detail&aid=1029064&group_id=103924&atid=636365 */
 	CommandCost ret = CheckFlatLandBelow(tile_org, w_org, h_org, flags & ~DC_EXEC, 5 << axis, _settings_game.station.nonuniform_stations ? &est : NULL);
+	CommandCost ret = CheckFlatLandBelow(tile_org, w_org, h_org, flags & ~DC_EXEC, 5 << axis, _settings_game.station.nonuniform_stations ? &est : NULL, true, rt);
 	if (CmdFailed(ret)) return ret;
 	CommandCost cost(EXPENSES_CONSTRUCTION, ret.GetCost() + (numtracks * _price.train_station_track + _price.train_station_length) * plat_len);
 	Station *st = NULL;
 	ret = FindJoiningStation(est, station_to_join, adjacent, new_location, &st);
 	if (CmdFailed(ret)) return ret;
@@ @@ -1042,13 +1065,13 @@ CommandCost CmdBuildRailStation(TileInde @@
 		byte numtracks_orig;
 		Track track;
 		/* Now really clear the land below the station
 		 * It should never return CMD_ERROR.. but you never know ;)
 		 * (a bit strange function name for it, but it really does clear the land, when DC_EXEC is in flags) */
 		ret = CheckFlatLandBelow(tile_org, w_org, h_org, flags, 5 << axis, _settings_game.station.nonuniform_stations ? &est : NULL);
+		ret = CheckFlatLandBelow(tile_org, w_org, h_org, flags, 5 << axis, _settings_game.station.nonuniform_stations ? &est : NULL, true, rt);
 		if (CmdFailed(ret)) return ret;
 		st->train_station = new_location;
 		st->AddFacility(FACIL_TRAIN, new_location.tile);
 		st->rect.BeforeAddRect(tile_org, w_org, h_org, StationRect::ADD_TRY);

src/unmovable_cmd.cpp

➞

Show inline comments

@@ @@ -96,13 +96,13 @@ void UpdateCompanyHQ(Company *c, uint sc @@
 	MarkTileDirtyByTile(tile);
 	MarkTileDirtyByTile(tile + TileDiffXY(0, 1));
 	MarkTileDirtyByTile(tile + TileDiffXY(1, 0));
 	MarkTileDirtyByTile(tile + TileDiffXY(1, 1));
+}
 extern CommandCost CheckFlatLandBelow(TileIndex tile, uint w, uint h, DoCommandFlag flags, uint invalid_dirs, StationID *station, bool check_clear = true);
+extern CommandCost CheckFlatLandBelow(TileIndex tile, uint w, uint h, DoCommandFlag flags, uint invalid_dirs, StationID *station, bool check_clear = true, RailType rt = INVALID_RAILTYPE);
 /** Build or relocate the HQ. This depends if the HQ is already built or not
  * @param tile tile where the HQ will be built or relocated to
  * @param flags type of operation
  * @param p1 unused
  * @param p2 unused

0 comments (0 inline, 0 general)