mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Un-bitstuff rail commands.

pull/9753/head
Michael Lutz 2021-11-14 20:07:23 +01:00
parent 6fe445e6c0
commit 55170ae703
7 changed files with 153 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

251
src/rail_cmd.cpp
View File

@ -429,18 +429,13 @@ static inline bool ValParamTrackOrientation(Track track)
* Build a single piece of rail * Build a single piece of rail
* @param flags operation to perform * @param flags operation to perform
* @param tile tile to build on * @param tile tile to build on
* @param p1 railtype of being built piece (normal, mono, maglev) * @param railtype railtype of being built piece (normal, mono, maglev)
* @param p2 various bitstuffed elements * @param track track-orientation
* - (bit 0- 2) - track-orientation, valid values: 0-5 (@see Track) * @param auto_remove_signals false = error on signal in the way, true = auto remove signals when in the way
* - (bit 3) - 0 = error on signal in the way, 1 = auto remove signals when in the way
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdBuildSingleRail(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdBuildSingleRail(DoCommandFlag flags, TileIndex tile, RailType railtype, Track track, bool auto_remove_signals)
{ {
RailType railtype = Extract<RailType, 0, 6>(p1);
Track track = Extract<Track, 0, 3>(p2);
bool auto_remove_signals = HasBit(p2, 3);
CommandCost cost(EXPENSES_CONSTRUCTION); CommandCost cost(EXPENSES_CONSTRUCTION);
if (!ValParamRailtype(railtype) || !ValParamTrackOrientation(track)) return CMD_ERROR; if (!ValParamRailtype(railtype) || !ValParamTrackOrientation(track)) return CMD_ERROR;
@ -471,7 +466,7 @@ CommandCost CmdBuildSingleRail(DoCommandFlag flags, TileIndex tile, uint32 p1, u
for (Track track_it = TRACK_BEGIN; track_it < TRACK_END; track_it++) { for (Track track_it = TRACK_BEGIN; track_it < TRACK_END; track_it++) {
if (HasTrack(tile, track_it) && HasSignalOnTrack(tile, track_it)) { if (HasTrack(tile, track_it) && HasSignalOnTrack(tile, track_it)) {
CommandCost ret_remove_signals = Command<CMD_REMOVE_SIGNALS>::Do(flags, tile, track_it, 0, {}); CommandCost ret_remove_signals = Command<CMD_REMOVE_SIGNALS>::Do(flags, tile, track_it);
if (ret_remove_signals.Failed()) return ret_remove_signals; if (ret_remove_signals.Failed()) return ret_remove_signals;
cost.AddCost(ret_remove_signals); cost.AddCost(ret_remove_signals);
} }
@ -483,7 +478,7 @@ CommandCost CmdBuildSingleRail(DoCommandFlag flags, TileIndex tile, uint32 p1, u
* the present rail type are powered on the new rail type. */ * the present rail type are powered on the new rail type. */
if (GetRailType(tile) != railtype && !HasPowerOnRail(railtype, GetRailType(tile))) { if (GetRailType(tile) != railtype && !HasPowerOnRail(railtype, GetRailType(tile))) {
if (HasPowerOnRail(GetRailType(tile), railtype)) { if (HasPowerOnRail(GetRailType(tile), railtype)) {
ret = Command<CMD_CONVERT_RAIL>::Do(flags, tile, tile, railtype, {}); ret = Command<CMD_CONVERT_RAIL>::Do(flags, tile, tile, railtype, false);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
cost.AddCost(ret); cost.AddCost(ret);
} else { } else {
@ -619,14 +614,11 @@ CommandCost CmdBuildSingleRail(DoCommandFlag flags, TileIndex tile, uint32 p1, u
* Remove a single piece of track * Remove a single piece of track
* @param flags operation to perform * @param flags operation to perform
* @param tile tile to remove track from * @param tile tile to remove track from
* @param p1 unused * @param track rail orientation
* @param p2 rail orientation
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdRemoveSingleRail(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdRemoveSingleRail(DoCommandFlag flags, TileIndex tile, Track track)
{ {
Track track = Extract<Track, 0, 3>(p2);
CommandCost cost(EXPENSES_CONSTRUCTION); CommandCost cost(EXPENSES_CONSTRUCTION);
bool crossing = false; bool crossing = false;
@ -693,7 +685,7 @@ CommandCost CmdRemoveSingleRail(DoCommandFlag flags, TileIndex tile, uint32 p1,
/* Charge extra to remove signals on the track, if they are there */ /* Charge extra to remove signals on the track, if they are there */
if (HasSignalOnTrack(tile, track)) { if (HasSignalOnTrack(tile, track)) {
cost.AddCost(Command<CMD_REMOVE_SIGNALS>::Do(flags, tile, track, 0, {})); cost.AddCost(Command<CMD_REMOVE_SIGNALS>::Do(flags, tile, track));
} }
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
@ -786,7 +778,7 @@ bool FloodHalftile(TileIndex t)
TrackBits to_remove = lower_track & rail_bits; TrackBits to_remove = lower_track & rail_bits;
if (to_remove != 0) { if (to_remove != 0) {
Backup<CompanyID> cur_company(_current_company, OWNER_WATER, FILE_LINE); Backup<CompanyID> cur_company(_current_company, OWNER_WATER, FILE_LINE);
flooded = Command<CMD_REMOVE_SINGLE_RAIL>::Do(DC_EXEC, t, 0, FIND_FIRST_BIT(to_remove), {}).Succeeded(); flooded = Command<CMD_REMOVE_SINGLE_RAIL>::Do(DC_EXEC, t, FindFirstTrack(to_remove)).Succeeded();
cur_company.Restore(); cur_company.Restore();
if (!flooded) return flooded; // not yet floodable if (!flooded) return flooded; // not yet floodable
rail_bits = rail_bits & ~to_remove; rail_bits = rail_bits & ~to_remove;
@ -876,27 +868,21 @@ static CommandCost ValidateAutoDrag(Trackdir *trackdir, TileIndex start, TileInd
* Build or remove a stretch of railroad tracks. * Build or remove a stretch of railroad tracks.
* @param flags operation to perform * @param flags operation to perform
* @param tile start tile of drag * @param tile start tile of drag
* @param p1 end tile of drag * @param end_tile end tile of drag
* @param p2 various bitstuffed elements * @param railtype railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev), only used for building
* - p2 = (bit 0-5) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev), only used for building * @param track track-orientation
* - p2 = (bit 6-8) - track-orientation, valid values: 0-5 (Track enum) * @param remove remove tracks?
* - p2 = (bit 9) - 0 = build, 1 = remove tracks * @param auto_remove_signals false = build up to an obstacle, true = fail if an obstacle is found (used for AIs), only used for building
* - p2 = (bit 10) - 0 = build up to an obstacle, 1 = fail if an obstacle is found (used for AIs). * @param fail_on_obstacle false = error on signal in the way, true = auto remove signals when in the way, only used for building
* - p2 = (bit 11) - 0 = error on signal in the way, 1 = auto remove signals when in the way
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
static CommandCost CmdRailTrackHelper(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) static CommandCost CmdRailTrackHelper(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, RailType railtype, Track track, bool remove, bool auto_remove_signals, bool fail_on_obstacle)
{ {
CommandCost total_cost(EXPENSES_CONSTRUCTION); CommandCost total_cost(EXPENSES_CONSTRUCTION);
Track track = Extract<Track, 6, 3>(p2);
bool remove = HasBit(p2, 9);
bool auto_remove_signals = HasBit(p2, 11);
RailType railtype = Extract<RailType, 0, 6>(p2);
if ((!remove && !ValParamRailtype(railtype)) || !ValParamTrackOrientation(track)) return CMD_ERROR; if ((!remove && !ValParamRailtype(railtype)) || !ValParamTrackOrientation(track)) return CMD_ERROR;
if (p1 >= MapSize()) return CMD_ERROR; if (end_tile >= MapSize()) return CMD_ERROR;
TileIndex end_tile = p1;
Trackdir trackdir = TrackToTrackdir(track); Trackdir trackdir = TrackToTrackdir(track);
CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile); CommandCost ret = ValidateAutoDrag(&trackdir, tile, end_tile);
@ -905,13 +891,12 @@ static CommandCost CmdRailTrackHelper(DoCommandFlag flags, TileIndex tile, uint3
bool had_success = false; bool had_success = false;
CommandCost last_error = CMD_ERROR; CommandCost last_error = CMD_ERROR;
for (;;) { for (;;) {
uint32 p2 = TrackdirToTrack(trackdir) | (auto_remove_signals << 3); CommandCost ret = remove ? Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, TrackdirToTrack(trackdir)) : Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, TrackdirToTrack(trackdir), auto_remove_signals);
CommandCost ret = remove ? Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, 0, p2, {}) : Command<CMD_BUILD_SINGLE_RAIL>::Do(flags, tile, railtype, p2, {});
if (ret.Failed()) { if (ret.Failed()) {
last_error = ret; last_error = ret;
if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) { if (last_error.GetErrorMessage() != STR_ERROR_ALREADY_BUILT && !remove) {
if (HasBit(p2, 10)) return last_error; if (fail_on_obstacle) return last_error;
break; break;
} }
@ -939,18 +924,17 @@ static CommandCost CmdRailTrackHelper(DoCommandFlag flags, TileIndex tile, uint3
* Stub for the unified rail builder/remover * Stub for the unified rail builder/remover
* @param flags operation to perform * @param flags operation to perform
* @param tile start tile of drag * @param tile start tile of drag
* @param p1 end tile of drag * @param end_tile end tile of drag
* @param p2 various bitstuffed elements * @param railtype railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev), only used for building
* - p2 = (bit 0-5) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev) * @param track track-orientation
* - p2 = (bit 6-8) - track-orientation, valid values: 0-5 (Track enum) * @param auto_remove_signals false = build up to an obstacle, true = fail if an obstacle is found (used for AIs).
* - p2 = (bit 9) - 0 = build, 1 = remove tracks * @param fail_on_obstacle false = error on signal in the way, true = auto remove signals when in the way
* @param text unused
* @return the cost of this operation or an error
* @see CmdRailTrackHelper * @see CmdRailTrackHelper
*/ */
CommandCost CmdBuildRailroadTrack(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdBuildRailroadTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, RailType railtype, Track track, bool auto_remove_signals, bool fail_on_obstacle)
{ {
return CmdRailTrackHelper(flags, tile, p1, ClrBit(p2, 9), text); return CmdRailTrackHelper(flags, tile, end_tile, railtype, track, false, auto_remove_signals, fail_on_obstacle);
} }
/** /**
@ -958,18 +942,14 @@ CommandCost CmdBuildRailroadTrack(DoCommandFlag flags, TileIndex tile, uint32 p1
* Stub for the unified rail builder/remover * Stub for the unified rail builder/remover
* @param flags operation to perform * @param flags operation to perform
* @param tile start tile of drag * @param tile start tile of drag
* @param p1 end tile of drag * @param end_tile end tile of drag
* @param p2 various bitstuffed elements * @param track track-orientation
* - p2 = (bit 0-5) - railroad type normal/maglev (0 = normal, 1 = mono, 2 = maglev), only used for building
* - p2 = (bit 6-8) - track-orientation, valid values: 0-5 (Track enum)
* - p2 = (bit 9) - 0 = build, 1 = remove tracks
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
* @see CmdRailTrackHelper * @see CmdRailTrackHelper
*/ */
CommandCost CmdRemoveRailroadTrack(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdRemoveRailroadTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track)
{ {
return CmdRailTrackHelper(flags, tile, p1, SetBit(p2, 9), text); return CmdRailTrackHelper(flags, tile, end_tile, INVALID_RAILTYPE, track, true, false, false);
} }
/** /**
@ -1037,45 +1017,36 @@ CommandCost CmdBuildTrainDepot(DoCommandFlag flags, TileIndex tile, RailType rai
/** /**
* Build signals, alternate between double/single, signal/semaphore, * Build signals, alternate between double/single, signal/semaphore,
* pre/exit/combo-signals, and what-else not. If the rail piece does not * pre/exit/combo-signals, and what-else not. If the rail piece does not
* have any signals, bit 4 (cycle signal-type) is ignored * have any signals, signal cycling is ignored
* @param flags operation to perform * @param flags operation to perform
* @param tile tile where to build the signals * @param tile tile where to build the signals
* @param p1 various bitstuffed elements * @param track track-orientation
* - p1 = (bit 0-2) - track-orientation, valid values: 0-5 (Track enum) * @param sigtype type of the signal
* - p1 = (bit 3) - 1 = override signal/semaphore, or pre/exit/combo signal or (for bit 7) toggle variant (CTRL-toggle) * @param sigvar variant of signal type (normal/semaphore)
* - p1 = (bit 4) - 0 = signals, 1 = semaphores * @param ctrl_pressed true = override signal/semaphore, or pre/exit/combo signal or toggle variant (CTRL-toggle)
* - p1 = (bit 5-7) - type of the signal, for valid values see enum SignalType in rail_map.h * @param convert_signal convert the present signal type and variant
* - p1 = (bit 8) - convert the present signal type and variant * @param cycle_start start cycle from this signal type
* - p1 = (bit 9-11)- start cycle from this signal type * @param cycle_stop wrap around after this signal type
* - p1 = (bit 12-14)-wrap around after this signal type * @param num_dir_cycle cycle the signal direction this many times
* - p1 = (bit 15-16)-cycle the signal direction this many times * @param skip_existing_signals true = don't modify an existing signal but don't fail either, false = always set new signal type
* - p1 = (bit 17) - 1 = don't modify an existing signal but don't fail either, 0 = always set new signal type * @param signals_copy used for CmdBuildManySignals() to copy direction of first signal
* @param p2 used for CmdBuildManySignals() to copy direction of first signal
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
* @todo p2 should be replaced by two bits for "along" and "against" the track. * @todo p2 should be replaced by two bits for "along" and "against" the track.
*/ */
CommandCost CmdBuildSingleSignal(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdBuildSingleSignal(DoCommandFlag flags, TileIndex tile, Track track, SignalType sigtype, SignalVariant sigvar, bool convert_signal, bool skip_existing_signals, bool ctrl_pressed, SignalType cycle_start, SignalType cycle_stop, uint8 num_dir_cycle, byte signals_copy)
{ {
Track track = Extract<Track, 0, 3>(p1); if (sigtype > SIGTYPE_LAST || sigvar > SIG_SEMAPHORE) return CMD_ERROR;
bool ctrl_pressed = HasBit(p1, 3); // was the CTRL button pressed
SignalVariant sigvar = (ctrl_pressed ^ HasBit(p1, 4)) ? SIG_SEMAPHORE : SIG_ELECTRIC; // the signal variant of the new signal
SignalType sigtype = Extract<SignalType, 5, 3>(p1); // the signal type of the new signal
bool convert_signal = HasBit(p1, 8); // convert button pressed
SignalType cycle_start = Extract<SignalType, 9, 3>(p1);
SignalType cycle_stop = Extract<SignalType, 12, 3>(p1);
uint num_dir_cycle = GB(p1, 15, 2);
if (sigtype > SIGTYPE_LAST) return CMD_ERROR;
if (cycle_start > cycle_stop || cycle_stop > SIGTYPE_LAST) return CMD_ERROR; if (cycle_start > cycle_stop || cycle_stop > SIGTYPE_LAST) return CMD_ERROR;
if (ctrl_pressed) sigvar = (SignalVariant)(sigvar ^ SIG_SEMAPHORE);
/* You can only build signals on plain rail tiles, and the selected track must exist */ /* You can only build signals on plain rail tiles, and the selected track must exist */
if (!ValParamTrackOrientation(track) || !IsPlainRailTile(tile) || if (!ValParamTrackOrientation(track) || !IsPlainRailTile(tile) ||
!HasTrack(tile, track)) { !HasTrack(tile, track)) {
return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK); return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK);
} }
/* Protect against invalid signal copying */ /* Protect against invalid signal copying */
if (p2 != 0 && (p2 & SignalOnTrack(track)) == 0) return CMD_ERROR; if (signals_copy != 0 && (signals_copy & SignalOnTrack(track)) == 0) return CMD_ERROR;
CommandCost ret = CheckTileOwnership(tile); CommandCost ret = CheckTileOwnership(tile);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
@ -1084,7 +1055,7 @@ CommandCost CmdBuildSingleSignal(DoCommandFlag flags, TileIndex tile, uint32 p1,
if (TracksOverlap(GetTrackBits(tile))) return_cmd_error(STR_ERROR_NO_SUITABLE_RAILROAD_TRACK); if (TracksOverlap(GetTrackBits(tile))) return_cmd_error(STR_ERROR_NO_SUITABLE_RAILROAD_TRACK);
/* In case we don't want to change an existing signal, return without error. */ /* In case we don't want to change an existing signal, return without error. */
if (HasBit(p1, 17) && HasSignalOnTrack(tile, track)) return CommandCost(); if (skip_existing_signals && HasSignalOnTrack(tile, track)) return CommandCost();
/* you can not convert a signal if no signal is on track */ /* you can not convert a signal if no signal is on track */
if (convert_signal && !HasSignalOnTrack(tile, track)) return_cmd_error(STR_ERROR_THERE_ARE_NO_SIGNALS); if (convert_signal && !HasSignalOnTrack(tile, track)) return_cmd_error(STR_ERROR_THERE_ARE_NO_SIGNALS);
@ -1094,7 +1065,7 @@ CommandCost CmdBuildSingleSignal(DoCommandFlag flags, TileIndex tile, uint32 p1,
/* build new signals */ /* build new signals */
cost = CommandCost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_SIGNALS]); cost = CommandCost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_SIGNALS]);
} else { } else {
if (p2 != 0 && sigvar != GetSignalVariant(tile, track)) { if (signals_copy != 0 && sigvar != GetSignalVariant(tile, track)) {
/* convert signals <-> semaphores */ /* convert signals <-> semaphores */
cost = CommandCost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_SIGNALS] + _price[PR_CLEAR_SIGNALS]); cost = CommandCost(EXPENSES_CONSTRUCTION, _price[PR_BUILD_SIGNALS] + _price[PR_CLEAR_SIGNALS]);
@ -1136,7 +1107,7 @@ CommandCost CmdBuildSingleSignal(DoCommandFlag flags, TileIndex tile, uint32 p1,
/* Subtract old signal infrastructure count. */ /* Subtract old signal infrastructure count. */
Company::Get(GetTileOwner(tile))->infrastructure.signal -= CountBits(GetPresentSignals(tile)); Company::Get(GetTileOwner(tile))->infrastructure.signal -= CountBits(GetPresentSignals(tile));
if (p2 == 0) { if (signals_copy == 0) {
if (!HasSignalOnTrack(tile, track)) { if (!HasSignalOnTrack(tile, track)) {
/* build new signals */ /* build new signals */
SetPresentSignals(tile, GetPresentSignals(tile) | (IsPbsSignal(sigtype) ? KillFirstBit(SignalOnTrack(track)) : SignalOnTrack(track))); SetPresentSignals(tile, GetPresentSignals(tile) | (IsPbsSignal(sigtype) ? KillFirstBit(SignalOnTrack(track)) : SignalOnTrack(track)));
@ -1180,7 +1151,7 @@ CommandCost CmdBuildSingleSignal(DoCommandFlag flags, TileIndex tile, uint32 p1,
} else { } else {
/* If CmdBuildManySignals is called with copying signals, just copy the /* If CmdBuildManySignals is called with copying signals, just copy the
* direction of the first signal given as parameter by CmdBuildManySignals */ * direction of the first signal given as parameter by CmdBuildManySignals */
SetPresentSignals(tile, (GetPresentSignals(tile) & ~SignalOnTrack(track)) | (p2 & SignalOnTrack(track))); SetPresentSignals(tile, (GetPresentSignals(tile) & ~SignalOnTrack(track)) | (signals_copy & SignalOnTrack(track)));
SetSignalVariant(tile, track, sigvar); SetSignalVariant(tile, track, sigvar);
SetSignalType(tile, track, sigtype); SetSignalType(tile, track, sigtype);
} }
@ -1257,37 +1228,27 @@ static bool AdvanceSignalAutoFill(TileIndex &tile, Trackdir &trackdir, bool remo
* Build many signals by dragging; AutoSignals * Build many signals by dragging; AutoSignals
* @param flags operation to perform * @param flags operation to perform
* @param tile start tile of drag * @param tile start tile of drag
* @param p1 end tile of drag * @param end_tile end tile of drag
* @param p2 various bitstuffed elements * @param track track-orientation
* - p2 = (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum) * @param sigtype default signal type
* - p2 = (bit 3) - 1 = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle) * @param sigvar signal variant to build
* - p2 = (bit 4) - 0 = signals, 1 = semaphores * @param mode true = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
* - p2 = (bit 5) - 0 = build, 1 = remove signals * @param remove remove signals?
* - p2 = (bit 6) - 0 = selected stretch, 1 = auto fill * @param autofill fill beyond selected stretch?
* - p2 = (bit 7- 9) - default signal type * @param minimise_gaps false = keep fixed distance, true = minimise gaps between signals
* - p2 = (bit 10) - 0 = keep fixed distance, 1 = minimise gaps between signals * @param signal_density user defined signals_density
* - p2 = (bit 24-31) - user defined signals_density
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
static CommandCost CmdSignalTrackHelper(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) static CommandCost CmdSignalTrackHelper(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track, SignalType sigtype, SignalVariant sigvar, bool mode, bool remove, bool autofill, bool minimise_gaps, int signal_density)
{ {
CommandCost total_cost(EXPENSES_CONSTRUCTION); CommandCost total_cost(EXPENSES_CONSTRUCTION);
TileIndex start_tile = tile;
Track track = Extract<Track, 0, 3>(p2); if (end_tile >= MapSize() || !ValParamTrackOrientation(track)) return CMD_ERROR;
bool mode = HasBit(p2, 3);
bool semaphores = HasBit(p2, 4);
bool remove = HasBit(p2, 5);
bool autofill = HasBit(p2, 6);
bool minimise_gaps = HasBit(p2, 10);
int signal_density = GB(p2, 24, 8);
if (p1 >= MapSize() || !ValParamTrackOrientation(track)) return CMD_ERROR;
TileIndex end_tile = p1;
if (signal_density == 0 || signal_density > 20) return CMD_ERROR; if (signal_density == 0 || signal_density > 20) return CMD_ERROR;
if (!remove && (sigtype > SIGTYPE_LAST || sigvar > SIG_SEMAPHORE)) return CMD_ERROR;
if (!IsPlainRailTile(tile)) return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK); if (!IsPlainRailTile(tile)) return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK);
TileIndex start_tile = tile;
/* Interpret signal_density as the logical length of said amount of tiles in X/Y direction. */ /* Interpret signal_density as the logical length of said amount of tiles in X/Y direction. */
signal_density *= TILE_AXIAL_DISTANCE; signal_density *= TILE_AXIAL_DISTANCE;
@ -1302,9 +1263,6 @@ static CommandCost CmdSignalTrackHelper(DoCommandFlag flags, TileIndex tile, uin
/* Must start on a valid track to be able to avoid loops */ /* Must start on a valid track to be able to avoid loops */
if (!HasTrack(tile, track)) return CMD_ERROR; if (!HasTrack(tile, track)) return CMD_ERROR;
SignalType sigtype = (SignalType)GB(p2, 7, 3);
if (sigtype > SIGTYPE_LAST) return CMD_ERROR;
byte signals; byte signals;
/* copy the signal-style of the first rail-piece if existing */ /* copy the signal-style of the first rail-piece if existing */
if (HasSignalOnTrack(tile, track)) { if (HasSignalOnTrack(tile, track)) {
@ -1312,7 +1270,7 @@ static CommandCost CmdSignalTrackHelper(DoCommandFlag flags, TileIndex tile, uin
assert(signals != 0); assert(signals != 0);
/* copy signal/semaphores style (independent of CTRL) */ /* copy signal/semaphores style (independent of CTRL) */
semaphores = GetSignalVariant(tile, track) != SIG_ELECTRIC; sigvar = GetSignalVariant(tile, track);
sigtype = GetSignalType(tile, track); sigtype = GetSignalType(tile, track);
/* Don't but copy entry or exit-signal type */ /* Don't but copy entry or exit-signal type */
@ -1344,22 +1302,14 @@ static CommandCost CmdSignalTrackHelper(DoCommandFlag flags, TileIndex tile, uin
Trackdir last_suitable_trackdir = INVALID_TRACKDIR; Trackdir last_suitable_trackdir = INVALID_TRACKDIR;
CommandCost last_error = CMD_ERROR; CommandCost last_error = CMD_ERROR;
bool had_success = false; bool had_success = false;
uint32 param1 = 0;
SB(param1, 3, 1, mode);
SB(param1, 4, 1, semaphores);
SB(param1, 5, 3, sigtype);
auto build_signal = [&](TileIndex tile, Trackdir trackdir, bool test_only) { auto build_signal = [&](TileIndex tile, Trackdir trackdir, bool test_only) {
SB(param1, 0, 3, TrackdirToTrack(trackdir));
SB(param1, 17, 1, (!remove && signal_ctr == 0 ? 1 : 0));
/* Pick the correct orientation for the track direction */ /* Pick the correct orientation for the track direction */
byte signals = 0; byte signals = 0;
if (HasBit(signal_dir, 0)) signals |= SignalAlongTrackdir(trackdir); if (HasBit(signal_dir, 0)) signals |= SignalAlongTrackdir(trackdir);
if (HasBit(signal_dir, 1)) signals |= SignalAgainstTrackdir(trackdir); if (HasBit(signal_dir, 1)) signals |= SignalAgainstTrackdir(trackdir);
DoCommandFlag do_flags = test_only ? flags & ~DC_EXEC : flags; DoCommandFlag do_flags = test_only ? flags & ~DC_EXEC : flags;
CommandCost ret = remove ? Command<CMD_REMOVE_SIGNALS>::Do(do_flags, tile, param1, signals, {}) : Command<CMD_BUILD_SIGNALS>::Do(do_flags, tile, param1, signals, {}); CommandCost ret = remove ? Command<CMD_REMOVE_SIGNALS>::Do(do_flags, tile, TrackdirToTrack(trackdir)) : Command<CMD_BUILD_SIGNALS>::Do(do_flags, tile, TrackdirToTrack(trackdir), sigtype, sigvar, false, signal_ctr == 0, mode, SIGTYPE_NORMAL, SIGTYPE_NORMAL, 0, signals);
if (test_only) return ret.Succeeded(); if (test_only) return ret.Succeeded();
@ -1469,40 +1419,31 @@ static CommandCost CmdSignalTrackHelper(DoCommandFlag flags, TileIndex tile, uin
* Stub for the unified signal builder/remover * Stub for the unified signal builder/remover
* @param flags operation to perform * @param flags operation to perform
* @param tile start tile of drag * @param tile start tile of drag
* @param p1 end tile of drag * @param end_tile end tile of drag
* @param p2 various bitstuffed elements * @param track track-orientation
* - p2 = (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum) * @param sigtype default signal type
* - p2 = (bit 3) - 1 = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle) * @param sigvar signal variant to build
* - p2 = (bit 4) - 0 = signals, 1 = semaphores * @param mode true = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
* - p2 = (bit 5) - 0 = build, 1 = remove signals * @param autofill fill beyond selected stretch?
* - p2 = (bit 6) - 0 = selected stretch, 1 = auto fill * @param minimise_gaps false = keep fixed distance, true = minimise gaps between signals
* - p2 = (bit 7- 9) - default signal type * @param signal_density user defined signals_density
* - p2 = (bit 24-31) - user defined signals_density
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
* @see CmdSignalTrackHelper * @see CmdSignalTrackHelper
*/ */
CommandCost CmdBuildSignalTrack(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdBuildSignalTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track, SignalType sigtype, SignalVariant sigvar, bool mode, bool autofill, bool minimise_gaps, byte signal_density)
{ {
return CmdSignalTrackHelper(flags, tile, p1, p2, text); return CmdSignalTrackHelper(flags, tile, end_tile, track, sigtype, sigvar, mode, false, autofill, minimise_gaps, signal_density);
} }
/** /**
* Remove signals * Remove signals
* @param flags operation to perform * @param flags operation to perform
* @param tile coordinates where signal is being deleted from * @param tile coordinates where signal is being deleted from
* @param p1 various bitstuffed elements, only track information is used * @param track track-orientation
* - (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum)
* - (bit 3) - override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
* - (bit 4) - 0 = signals, 1 = semaphores
* @param p2 unused
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdRemoveSingleSignal(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdRemoveSingleSignal(DoCommandFlag flags, TileIndex tile, Track track)
{ {
Track track = Extract<Track, 0, 3>(p1);
if (!ValParamTrackOrientation(track) || !IsPlainRailTile(tile) || !HasTrack(tile, track)) { if (!ValParamTrackOrientation(track) || !IsPlainRailTile(tile) || !HasTrack(tile, track)) {
return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK); return_cmd_error(STR_ERROR_THERE_IS_NO_RAILROAD_TRACK);
} }
@ -1561,22 +1502,15 @@ CommandCost CmdRemoveSingleSignal(DoCommandFlag flags, TileIndex tile, uint32 p1
* Stub for the unified signal builder/remover * Stub for the unified signal builder/remover
* @param flags operation to perform * @param flags operation to perform
* @param tile start tile of drag * @param tile start tile of drag
* @param p1 end tile of drag * @param end_tile end tile of drag
* @param p2 various bitstuffed elements * @param track track-orientation
* - p2 = (bit 0- 2) - track-orientation, valid values: 0-5 (Track enum) * @param autofill fill beyond selected stretch?
* - p2 = (bit 3) - 1 = override signal/semaphore, or pre/exit/combo signal (CTRL-toggle)
* - p2 = (bit 4) - 0 = signals, 1 = semaphores
* - p2 = (bit 5) - 0 = build, 1 = remove signals
* - p2 = (bit 6) - 0 = selected stretch, 1 = auto fill
* - p2 = (bit 7- 9) - default signal type
* - p2 = (bit 24-31) - user defined signals_density
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
* @see CmdSignalTrackHelper * @see CmdSignalTrackHelper
*/ */
CommandCost CmdRemoveSignalTrack(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdRemoveSignalTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track, bool autofill)
{ {
return CmdSignalTrackHelper(flags, tile, p1, SetBit(p2, 5), text); // bit 5 is remove bit return CmdSignalTrackHelper(flags, tile, end_tile, track, SIGTYPE_NORMAL, SIG_ELECTRIC, false, true, autofill, false, 1); // bit 5 is remove bit
} }
/** Update power of train under which is the railtype being converted */ /** Update power of train under which is the railtype being converted */
@ -1595,19 +1529,14 @@ static Vehicle *UpdateTrainPowerProc(Vehicle *v, void *data)
* monorail/maglev easily or vice-versa. * monorail/maglev easily or vice-versa.
* @param flags operation to perform * @param flags operation to perform
* @param tile end tile of rail conversion drag * @param tile end tile of rail conversion drag
* @param p1 start tile of drag * @param area_start start tile of drag
* @param p2 various bitstuffed elements: * @param totype new railtype to convert to.
* - p2 = (bit 0- 5) new railtype to convert to. * @param diagonal build diagonally or not.
* - p2 = (bit 6) build diagonally or not.
* @param text unused
* @return the cost of this operation or an error * @return the cost of this operation or an error
*/ */
CommandCost CmdConvertRail(DoCommandFlag flags, TileIndex tile, uint32 p1, uint32 p2, const std::string &text) CommandCost CmdConvertRail(DoCommandFlag flags, TileIndex tile, TileIndex area_start, RailType totype, bool diagonal)
{ {
RailType totype = Extract<RailType, 0, 6>(p2);
TileIndex area_start = p1;
TileIndex area_end = tile; TileIndex area_end = tile;
bool diagonal = HasBit(p2, 6);
if (!ValParamRailtype(totype)) return CMD_ERROR; if (!ValParamRailtype(totype)) return CMD_ERROR;
if (area_start >= MapSize()) return CMD_ERROR; if (area_start >= MapSize()) return CMD_ERROR;
@ -1879,7 +1808,7 @@ static CommandCost ClearTile_Track(TileIndex tile, DoCommandFlag flags)
TrackBits tracks = GetTrackBits(tile); TrackBits tracks = GetTrackBits(tile);
while (tracks != TRACK_BIT_NONE) { while (tracks != TRACK_BIT_NONE) {
Track track = RemoveFirstTrack(&tracks); Track track = RemoveFirstTrack(&tracks);
CommandCost ret = Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, 0, track, {}); CommandCost ret = Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile, track);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
cost.AddCost(ret); cost.AddCost(ret);
} }

21
src/rail_cmd.h
View File

@ -11,17 +11,20 @@
#define RAIL_CMD_H #define RAIL_CMD_H
#include "command_type.h" #include "command_type.h"
#include "track_type.h"
#include "rail_type.h"
#include "signal_type.h"
CommandProc CmdBuildRailroadTrack; CommandCost CmdBuildRailroadTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, RailType railtype, Track track, bool auto_remove_signals, bool fail_on_obstacle);
CommandProc CmdRemoveRailroadTrack; CommandCost CmdRemoveRailroadTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track);
CommandProc CmdBuildSingleRail; CommandCost CmdBuildSingleRail(DoCommandFlag flags, TileIndex tile, RailType railtype, Track track, bool auto_remove_signals);
CommandProc CmdRemoveSingleRail; CommandCost CmdRemoveSingleRail(DoCommandFlag flags, TileIndex tile, Track track);
CommandCost CmdBuildTrainDepot(DoCommandFlag flags, TileIndex tile, RailType railtype, DiagDirection dir); CommandCost CmdBuildTrainDepot(DoCommandFlag flags, TileIndex tile, RailType railtype, DiagDirection dir);
CommandProc CmdBuildSingleSignal; CommandCost CmdBuildSingleSignal(DoCommandFlag flags, TileIndex tile, Track track, SignalType sigtype, SignalVariant sigvar, bool convert_signal, bool skip_existing_signals, bool ctrl_pressed, SignalType cycle_start, SignalType cycle_stop, uint8 num_dir_cycle, byte signals_copy);
CommandProc CmdRemoveSingleSignal; CommandCost CmdRemoveSingleSignal(DoCommandFlag flags, TileIndex tile, Track track);
CommandProc CmdConvertRail; CommandCost CmdConvertRail(DoCommandFlag flags, TileIndex tile, TileIndex area_start, RailType totype, bool diagonal);
CommandProc CmdBuildSignalTrack; CommandCost CmdBuildSignalTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track, SignalType sigtype, SignalVariant sigvar, bool mode, bool autofill, bool minimise_gaps, byte signal_density);
CommandProc CmdRemoveSignalTrack; CommandCost CmdRemoveSignalTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track, bool autofill);
DEF_CMD_TRAIT(CMD_BUILD_RAILROAD_TRACK, CmdBuildRailroadTrack, CMD_AUTO | CMD_NO_WATER, CMDT_LANDSCAPE_CONSTRUCTION) DEF_CMD_TRAIT(CMD_BUILD_RAILROAD_TRACK, CmdBuildRailroadTrack, CMD_AUTO | CMD_NO_WATER, CMDT_LANDSCAPE_CONSTRUCTION)
DEF_CMD_TRAIT(CMD_REMOVE_RAILROAD_TRACK, CmdRemoveRailroadTrack, CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION) DEF_CMD_TRAIT(CMD_REMOVE_RAILROAD_TRACK, CmdRemoveRailroadTrack, CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION)

83
src/rail_gui.cpp
View File

@ -94,14 +94,14 @@ void CcPlaySound_CONSTRUCTION_RAIL(Commands cmd, const CommandCost &result,TileI
if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_20_CONSTRUCTION_RAIL, tile); if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_20_CONSTRUCTION_RAIL, tile);
} }
static void GenericPlaceRail(TileIndex tile, int cmd) static void GenericPlaceRail(TileIndex tile, Track track)
{ {
if (_remove_button_clicked) { if (_remove_button_clicked) {
Command<CMD_REMOVE_SINGLE_RAIL>::Post(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL, Command<CMD_REMOVE_SINGLE_RAIL>::Post(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL,
tile, _cur_railtype, cmd | (_settings_client.gui.auto_remove_signals << 3), {}); tile, track);
} else { } else {
Command<CMD_BUILD_SINGLE_RAIL>::Post(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL, Command<CMD_BUILD_SINGLE_RAIL>::Post(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL,
tile, _cur_railtype, cmd | (_settings_client.gui.auto_remove_signals << 3), {}); tile, _cur_railtype, track, _settings_client.gui.auto_remove_signals);
} }
} }
@ -118,7 +118,7 @@ static void PlaceExtraDepotRail(TileIndex tile, DiagDirection dir, Track track)
if (GetRailTileType(tile) == RAIL_TILE_SIGNALS && !_settings_client.gui.auto_remove_signals) return; if (GetRailTileType(tile) == RAIL_TILE_SIGNALS && !_settings_client.gui.auto_remove_signals) return;
if ((GetTrackBits(tile) & DiagdirReachesTracks(dir)) == 0) return; if ((GetTrackBits(tile) & DiagdirReachesTracks(dir)) == 0) return;
Command<CMD_BUILD_SINGLE_RAIL>::Post(tile, _cur_railtype, track | (_settings_client.gui.auto_remove_signals << 3), {}); Command<CMD_BUILD_SINGLE_RAIL>::Post(tile, _cur_railtype, track, _settings_client.gui.auto_remove_signals);
} }
/** Additional pieces of track to add at the entrance of a depot. */ /** Additional pieces of track to add at the entrance of a depot. */
@ -240,39 +240,21 @@ static void GenericPlaceSignals(TileIndex tile)
Track track = FindFirstTrack(trackbits); Track track = FindFirstTrack(trackbits);
if (_remove_button_clicked) { if (_remove_button_clicked) {
Command<CMD_REMOVE_SIGNALS>::Post(STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM, CcPlaySound_CONSTRUCTION_RAIL, tile, track, 0, {}); Command<CMD_REMOVE_SIGNALS>::Post(STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM, CcPlaySound_CONSTRUCTION_RAIL, tile, track);
} else { } else {
const Window *w = FindWindowById(WC_BUILD_SIGNAL, 0);
/* various bitstuffed elements for CmdBuildSingleSignal() */
uint32 p1 = track;
/* Which signals should we cycle through? */ /* Which signals should we cycle through? */
uint8 cycle_types; SignalType cycle_start = _settings_client.gui.cycle_signal_types == SIGNAL_CYCLE_ALL && _settings_client.gui.signal_gui_mode == SIGNAL_GUI_ALL ? SIGTYPE_NORMAL : SIGTYPE_PBS;
if (_settings_client.gui.cycle_signal_types == SIGNAL_CYCLE_ALL && _settings_client.gui.signal_gui_mode == SIGNAL_GUI_ALL) { if (FindWindowById(WC_BUILD_SIGNAL, 0) != nullptr) {
cycle_types = SIGTYPE_NORMAL | (SIGTYPE_LAST << 3);
} else {
cycle_types = SIGTYPE_PBS | (SIGTYPE_LAST << 3);
}
if (w != nullptr) {
/* signal GUI is used */ /* signal GUI is used */
SB(p1, 3, 1, _ctrl_pressed); Command<CMD_BUILD_SIGNALS>::Post(_convert_signal_button ? STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE : STR_ERROR_CAN_T_BUILD_SIGNALS_HERE, CcPlaySound_CONSTRUCTION_RAIL,
SB(p1, 4, 1, _cur_signal_variant); tile, track, _cur_signal_type, _cur_signal_variant, _convert_signal_button, false, _ctrl_pressed, cycle_start, SIGTYPE_LAST, 0, 0);
SB(p1, 5, 3, _cur_signal_type);
SB(p1, 8, 1, _convert_signal_button);
SB(p1, 9, 6, cycle_types);
} else { } else {
SB(p1, 3, 1, _ctrl_pressed); SignalVariant sigvar = _cur_year < _settings_client.gui.semaphore_build_before ? SIG_SEMAPHORE : SIG_ELECTRIC;
SB(p1, 4, 1, (_cur_year < _settings_client.gui.semaphore_build_before ? SIG_SEMAPHORE : SIG_ELECTRIC)); Command<CMD_BUILD_SIGNALS>::Post(STR_ERROR_CAN_T_BUILD_SIGNALS_HERE, CcPlaySound_CONSTRUCTION_RAIL,
SB(p1, 5, 3, SIGTYPE_PBS_ONEWAY); tile, track, SIGTYPE_PBS_ONEWAY, sigvar, false, false, _ctrl_pressed, cycle_start, SIGTYPE_LAST, 0, 0);
SB(p1, 8, 1, 0);
SB(p1, 9, 6, cycle_types);
}
Command<CMD_BUILD_SIGNALS>::Post((w != nullptr && _convert_signal_button) ? STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE : STR_ERROR_CAN_T_BUILD_SIGNALS_HERE, }
CcPlaySound_CONSTRUCTION_RAIL, tile, p1, 0, {});
} }
} }
@ -371,21 +353,20 @@ static void BuildRailClick_Remove(Window *w)
} }
} }
static void DoRailroadTrack(int mode) static void DoRailroadTrack(Track track)
{ {
uint32 p2 = _cur_railtype | (mode << 6) | (_settings_client.gui.auto_remove_signals << 11);
if (_remove_button_clicked) { if (_remove_button_clicked) {
Command<CMD_REMOVE_RAILROAD_TRACK>::Post(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL, Command<CMD_REMOVE_RAILROAD_TRACK>::Post(STR_ERROR_CAN_T_REMOVE_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL,
TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), p2, {}); TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), track);
} else { } else {
Command<CMD_BUILD_RAILROAD_TRACK>::Post(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL, Command<CMD_BUILD_RAILROAD_TRACK>::Post(STR_ERROR_CAN_T_BUILD_RAILROAD_TRACK, CcPlaySound_CONSTRUCTION_RAIL,
TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), p2, {}); TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype, track, _settings_client.gui.auto_remove_signals, false);
} }
} }
static void HandleAutodirPlacement() static void HandleAutodirPlacement()
{ {
int trackstat = _thd.drawstyle & HT_DIR_MASK; // 0..5 Track trackstat = static_cast<Track>( _thd.drawstyle & HT_DIR_MASK); // 0..5
if (_thd.drawstyle & HT_RAIL) { // one tile case if (_thd.drawstyle & HT_RAIL) { // one tile case
GenericPlaceRail(TileVirtXY(_thd.selend.x, _thd.selend.y), trackstat); GenericPlaceRail(TileVirtXY(_thd.selend.x, _thd.selend.y), trackstat);
@ -403,40 +384,24 @@ static void HandleAutodirPlacement()
*/ */
static void HandleAutoSignalPlacement() static void HandleAutoSignalPlacement()
{ {
uint32 p2 = GB(_thd.drawstyle, 0, 3); // 0..5 Track track = (Track)GB(_thd.drawstyle, 0, 3); // 0..5
if ((_thd.drawstyle & HT_DRAG_MASK) == HT_RECT) { // one tile case if ((_thd.drawstyle & HT_DRAG_MASK) == HT_RECT) { // one tile case
GenericPlaceSignals(TileVirtXY(_thd.selend.x, _thd.selend.y)); GenericPlaceSignals(TileVirtXY(_thd.selend.x, _thd.selend.y));
return; return;
} }
const Window *w = FindWindowById(WC_BUILD_SIGNAL, 0);
if (w != nullptr) {
/* signal GUI is used */
SB(p2, 3, 1, 0);
SB(p2, 4, 1, _cur_signal_variant);
SB(p2, 6, 1, _ctrl_pressed);
SB(p2, 7, 3, _cur_signal_type);
SB(p2, 24, 8, _settings_client.gui.drag_signals_density);
SB(p2, 10, 1, !_settings_client.gui.drag_signals_fixed_distance);
} else {
SB(p2, 3, 1, 0);
SB(p2, 4, 1, (_cur_year < _settings_client.gui.semaphore_build_before ? SIG_SEMAPHORE : SIG_ELECTRIC));
SB(p2, 6, 1, _ctrl_pressed);
SB(p2, 7, 3, SIGTYPE_PBS_ONEWAY);
SB(p2, 24, 8, _settings_client.gui.drag_signals_density);
SB(p2, 10, 1, !_settings_client.gui.drag_signals_fixed_distance);
}
/* _settings_client.gui.drag_signals_density is given as a parameter such that each user /* _settings_client.gui.drag_signals_density is given as a parameter such that each user
* in a network game can specify their own signal density */ * in a network game can specify their own signal density */
if (_remove_button_clicked) { if (_remove_button_clicked) {
Command<CMD_REMOVE_SIGNAL_TRACK>::Post(STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM, CcPlaySound_CONSTRUCTION_RAIL, Command<CMD_REMOVE_SIGNAL_TRACK>::Post(STR_ERROR_CAN_T_REMOVE_SIGNALS_FROM, CcPlaySound_CONSTRUCTION_RAIL,
TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), p2, {}); TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), track, _ctrl_pressed);
} else { } else {
bool sig_gui = FindWindowById(WC_BUILD_SIGNAL, 0) != nullptr;
SignalType sigtype = sig_gui ? _cur_signal_type : SIGTYPE_PBS_ONEWAY;
SignalVariant sigvar = sig_gui ? _cur_signal_variant : (_cur_year < _settings_client.gui.semaphore_build_before ? SIG_SEMAPHORE : SIG_ELECTRIC);
Command<CMD_BUILD_SIGNAL_TRACK>::Post(STR_ERROR_CAN_T_BUILD_SIGNALS_HERE, CcPlaySound_CONSTRUCTION_RAIL, Command<CMD_BUILD_SIGNAL_TRACK>::Post(STR_ERROR_CAN_T_BUILD_SIGNALS_HERE, CcPlaySound_CONSTRUCTION_RAIL,
TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), p2, {}); TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), track, sigtype, sigvar, false, _ctrl_pressed, !_settings_client.gui.drag_signals_fixed_distance, _settings_client.gui.drag_signals_density);
} }
} }
@ -725,7 +690,7 @@ struct BuildRailToolbarWindow : Window {
break; break;
case DDSP_CONVERT_RAIL: case DDSP_CONVERT_RAIL:
Command<CMD_CONVERT_RAIL>::Post(STR_ERROR_CAN_T_CONVERT_RAIL, CcPlaySound_CONSTRUCTION_RAIL, end_tile, start_tile, _cur_railtype | (_ctrl_pressed ? 1 << 6 : 0), {}); Command<CMD_CONVERT_RAIL>::Post(STR_ERROR_CAN_T_CONVERT_RAIL, CcPlaySound_CONSTRUCTION_RAIL, end_tile, start_tile, _cur_railtype, _ctrl_pressed);
break; break;
case DDSP_REMOVE_STATION: case DDSP_REMOVE_STATION:

2
src/road_cmd.cpp
View File

@ -2229,7 +2229,7 @@ static void ChangeTileOwner_Road(TileIndex tile, Owner old_owner, Owner new_owne
if (IsLevelCrossing(tile)) { if (IsLevelCrossing(tile)) {
if (GetTileOwner(tile) == old_owner) { if (GetTileOwner(tile) == old_owner) {
if (new_owner == INVALID_OWNER) { if (new_owner == INVALID_OWNER) {
Command<CMD_REMOVE_SINGLE_RAIL>::Do(DC_EXEC | DC_BANKRUPT, tile, 0, GetCrossingRailTrack(tile), {}); Command<CMD_REMOVE_SINGLE_RAIL>::Do(DC_EXEC | DC_BANKRUPT, tile, GetCrossingRailTrack(tile));
} else { } else {
/* Update infrastructure counts. No need to dirty windows here, we'll redraw the whole screen anyway. */ /* Update infrastructure counts. No need to dirty windows here, we'll redraw the whole screen anyway. */
Company::Get(old_owner)->infrastructure.rail[GetRailType(tile)] -= LEVELCROSSING_TRACKBIT_FACTOR; Company::Get(old_owner)->infrastructure.rail[GetRailType(tile)] -= LEVELCROSSING_TRACKBIT_FACTOR;

48
src/script/api/script_rail.cpp
View File

@ -116,7 +116,7 @@
EnforcePrecondition(false, ::IsValidTile(end_tile)); EnforcePrecondition(false, ::IsValidTile(end_tile));
EnforcePrecondition(false, IsRailTypeAvailable(convert_to)); EnforcePrecondition(false, IsRailTypeAvailable(convert_to));
return ScriptObject::Command<CMD_CONVERT_RAIL>::Do(start_tile, end_tile, convert_to, {}); return ScriptObject::Command<CMD_CONVERT_RAIL>::Do(start_tile, end_tile, (::RailType)convert_to, false);
} }
/* static */ TileIndex ScriptRail::GetRailDepotFrontTile(TileIndex depot) /* static */ TileIndex ScriptRail::GetRailDepotFrontTile(TileIndex depot)
@ -253,7 +253,7 @@
EnforcePrecondition(false, KillFirstBit((uint)rail_track) == 0); EnforcePrecondition(false, KillFirstBit((uint)rail_track) == 0);
EnforcePrecondition(false, IsRailTypeAvailable(GetCurrentRailType())); EnforcePrecondition(false, IsRailTypeAvailable(GetCurrentRailType()));
return ScriptObject::Command<CMD_BUILD_RAILROAD_TRACK>::Do(tile, tile, GetCurrentRailType() | (FindFirstTrack((::TrackBits)rail_track) << 6), {}); return ScriptObject::Command<CMD_BUILD_RAILROAD_TRACK>::Do(tile, tile, (::RailType)GetCurrentRailType(), FindFirstTrack((::TrackBits)rail_track), false, false);
} }
/* static */ bool ScriptRail::RemoveRailTrack(TileIndex tile, RailTrack rail_track) /* static */ bool ScriptRail::RemoveRailTrack(TileIndex tile, RailTrack rail_track)
@ -264,7 +264,7 @@
EnforcePrecondition(false, GetRailTracks(tile) & rail_track); EnforcePrecondition(false, GetRailTracks(tile) & rail_track);
EnforcePrecondition(false, KillFirstBit((uint)rail_track) == 0); EnforcePrecondition(false, KillFirstBit((uint)rail_track) == 0);
return ScriptObject::Command<CMD_REMOVE_RAILROAD_TRACK>::Do(tile, tile, FindFirstTrack((::TrackBits)rail_track) << 6, {}); return ScriptObject::Command<CMD_REMOVE_RAILROAD_TRACK>::Do(tile, tile, FindFirstTrack((::TrackBits)rail_track));
} }
/* static */ bool ScriptRail::AreTilesConnected(TileIndex from, TileIndex tile, TileIndex to) /* static */ bool ScriptRail::AreTilesConnected(TileIndex from, TileIndex tile, TileIndex to)
@ -292,21 +292,21 @@
* Prepare the second parameter for CmdBuildRailroadTrack and CmdRemoveRailroadTrack. The direction * Prepare the second parameter for CmdBuildRailroadTrack and CmdRemoveRailroadTrack. The direction
* depends on all three tiles. Sometimes the third tile needs to be adjusted. * depends on all three tiles. Sometimes the third tile needs to be adjusted.
*/ */
static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to) static Track SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to)
{ {
int diag_offset = abs(abs((int)::TileX(*to) - (int)::TileX(tile)) - abs((int)::TileY(*to) - (int)::TileY(tile))); int diag_offset = abs(abs((int)::TileX(*to) - (int)::TileX(tile)) - abs((int)::TileY(*to) - (int)::TileY(tile)));
uint32 p2 = 0; Track track = TRACK_BEGIN;
if (::TileY(from) == ::TileY(*to)) { if (::TileY(from) == ::TileY(*to)) {
p2 |= (TRACK_X << 6); track = TRACK_X;
*to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1); *to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1);
} else if (::TileX(from) == ::TileX(*to)) { } else if (::TileX(from) == ::TileX(*to)) {
p2 |= (TRACK_Y << 6); track = TRACK_Y;
*to -= ::MapSizeX() * Clamp((int)::TileY(*to) - (int)::TileY(tile), -1, 1); *to -= ::MapSizeX() * Clamp((int)::TileY(*to) - (int)::TileY(tile), -1, 1);
} else if (::TileY(from) < ::TileY(tile)) { } else if (::TileY(from) < ::TileY(tile)) {
if (::TileX(*to) < ::TileX(tile)) { if (::TileX(*to) < ::TileX(tile)) {
p2 |= (TRACK_UPPER << 6); track = TRACK_UPPER;
} else { } else {
p2 |= (TRACK_LEFT << 6); track = TRACK_LEFT;
} }
if (diag_offset != 0) { if (diag_offset != 0) {
*to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1); *to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1);
@ -315,9 +315,9 @@ static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to)
} }
} else if (::TileY(from) > ::TileY(tile)) { } else if (::TileY(from) > ::TileY(tile)) {
if (::TileX(*to) < ::TileX(tile)) { if (::TileX(*to) < ::TileX(tile)) {
p2 |= (TRACK_RIGHT << 6); track = TRACK_RIGHT;
} else { } else {
p2 |= (TRACK_LOWER << 6); track = TRACK_LOWER;
} }
if (diag_offset != 0) { if (diag_offset != 0) {
*to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1); *to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1);
@ -326,9 +326,9 @@ static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to)
} }
} else if (::TileX(from) < ::TileX(tile)) { } else if (::TileX(from) < ::TileX(tile)) {
if (::TileY(*to) < ::TileY(tile)) { if (::TileY(*to) < ::TileY(tile)) {
p2 |= (TRACK_UPPER << 6); track = TRACK_UPPER;
} else { } else {
p2 |= (TRACK_RIGHT << 6); track = TRACK_RIGHT;
} }
if (diag_offset == 0) { if (diag_offset == 0) {
*to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1); *to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1);
@ -337,9 +337,9 @@ static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to)
} }
} else if (::TileX(from) > ::TileX(tile)) { } else if (::TileX(from) > ::TileX(tile)) {
if (::TileY(*to) < ::TileY(tile)) { if (::TileY(*to) < ::TileY(tile)) {
p2 |= (TRACK_LEFT << 6); track = TRACK_LEFT;
} else { } else {
p2 |= (TRACK_LOWER << 6); track = TRACK_LOWER;
} }
if (diag_offset == 0) { if (diag_offset == 0) {
*to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1); *to -= Clamp((int)::TileX(*to) - (int)::TileX(tile), -1, 1);
@ -347,7 +347,7 @@ static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to)
*to -= ::MapSizeX() * Clamp((int)::TileY(*to) - (int)::TileY(tile), -1, 1); *to -= ::MapSizeX() * Clamp((int)::TileY(*to) - (int)::TileY(tile), -1, 1);
} }
} }
return p2; return track;
} }
/* static */ bool ScriptRail::BuildRail(TileIndex from, TileIndex tile, TileIndex to) /* static */ bool ScriptRail::BuildRail(TileIndex from, TileIndex tile, TileIndex to)
@ -364,8 +364,8 @@ static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to)
(::TileX(from) == ::TileX(tile) && ::TileX(tile) == ::TileX(to)) || (::TileX(from) == ::TileX(tile) && ::TileX(tile) == ::TileX(to)) ||
(::TileY(from) == ::TileY(tile) && ::TileY(tile) == ::TileY(to))); (::TileY(from) == ::TileY(tile) && ::TileY(tile) == ::TileY(to)));
uint32 p2 = SimulateDrag(from, tile, &to) | 1 << 10 | ScriptRail::GetCurrentRailType();; Track track = SimulateDrag(from, tile, &to);
return ScriptObject::Command<CMD_BUILD_RAILROAD_TRACK>::Do(tile, to, p2, {}); return ScriptObject::Command<CMD_BUILD_RAILROAD_TRACK>::Do(tile, to, (::RailType)ScriptRail::GetCurrentRailType(), track, false, true);
} }
/* static */ bool ScriptRail::RemoveRail(TileIndex from, TileIndex tile, TileIndex to) /* static */ bool ScriptRail::RemoveRail(TileIndex from, TileIndex tile, TileIndex to)
@ -381,8 +381,8 @@ static uint32 SimulateDrag(TileIndex from, TileIndex tile, TileIndex *to)
(::TileX(from) == ::TileX(tile) && ::TileX(tile) == ::TileX(to)) || (::TileX(from) == ::TileX(tile) && ::TileX(tile) == ::TileX(to)) ||
(::TileY(from) == ::TileY(tile) && ::TileY(tile) == ::TileY(to))); (::TileY(from) == ::TileY(tile) && ::TileY(tile) == ::TileY(to)));
uint32 p2 = SimulateDrag(from, tile, &to); Track track = SimulateDrag(from, tile, &to);
return ScriptObject::Command<CMD_REMOVE_RAILROAD_TRACK>::Do(tile, to, p2, {}); return ScriptObject::Command<CMD_REMOVE_RAILROAD_TRACK>::Do(tile, to, track);
} }
/** /**
@ -461,14 +461,12 @@ static bool IsValidSignalType(int signal_type)
} }
EnforcePrecondition(false, track != INVALID_TRACK); EnforcePrecondition(false, track != INVALID_TRACK);
uint p1 = track;
if (signal < SIGNALTYPE_TWOWAY) { if (signal < SIGNALTYPE_TWOWAY) {
if (signal != SIGNALTYPE_PBS && signal != SIGNALTYPE_PBS_ONEWAY) signal_cycles++; if (signal != SIGNALTYPE_PBS && signal != SIGNALTYPE_PBS_ONEWAY) signal_cycles++;
p1 |= (signal_cycles << 15);
} }
p1 |= ((signal >= SIGNALTYPE_TWOWAY ? signal ^ SIGNALTYPE_TWOWAY : signal) << 5); ::SignalType sig_type = (::SignalType)(signal >= SIGNALTYPE_TWOWAY ? signal ^ SIGNALTYPE_TWOWAY : signal);
return ScriptObject::Command<CMD_BUILD_SIGNALS>::Do(tile, p1, 0, {}); return ScriptObject::Command<CMD_BUILD_SIGNALS>::Do(tile, track, sig_type, ::SIG_ELECTRIC, false, false, false, ::SIGTYPE_NORMAL, ::SIGTYPE_NORMAL, signal_cycles, 0);
} }
/* static */ bool ScriptRail::RemoveSignal(TileIndex tile, TileIndex front) /* static */ bool ScriptRail::RemoveSignal(TileIndex tile, TileIndex front)
@ -487,7 +485,7 @@ static bool IsValidSignalType(int signal_type)
} }
EnforcePrecondition(false, track != INVALID_TRACK); EnforcePrecondition(false, track != INVALID_TRACK);
return ScriptObject::Command<CMD_REMOVE_SIGNALS>::Do(tile, track, 0, {}); return ScriptObject::Command<CMD_REMOVE_SIGNALS>::Do(tile, track);
} }
/* static */ Money ScriptRail::GetBuildCost(RailType railtype, BuildType build_type) /* static */ Money ScriptRail::GetBuildCost(RailType railtype, BuildType build_type)

4
src/signal_type.h
View File

@ -13,14 +13,14 @@
#include "core/enum_type.hpp" #include "core/enum_type.hpp"
/** Variant of the signal, i.e. how does the signal look? */ /** Variant of the signal, i.e. how does the signal look? */
enum SignalVariant { enum SignalVariant : byte {
SIG_ELECTRIC = 0, ///< Light signal SIG_ELECTRIC = 0, ///< Light signal
SIG_SEMAPHORE = 1, ///< Old-fashioned semaphore signal SIG_SEMAPHORE = 1, ///< Old-fashioned semaphore signal
}; };
/** Type of signal, i.e. how does the signal behave? */ /** Type of signal, i.e. how does the signal behave? */
enum SignalType { enum SignalType : byte {
SIGTYPE_NORMAL = 0, ///< normal signal SIGTYPE_NORMAL = 0, ///< normal signal
SIGTYPE_ENTRY = 1, ///< presignal block entry SIGTYPE_ENTRY = 1, ///< presignal block entry
SIGTYPE_EXIT = 2, ///< presignal block exit SIGTYPE_EXIT = 2, ///< presignal block exit

2
src/station_cmd.cpp
View File

@ -925,7 +925,7 @@ static CommandCost CheckFlatLandRailStation(TileArea tile_area, DoCommandFlag fl
affected_vehicles.push_back(v); affected_vehicles.push_back(v);
} }
} }
CommandCost ret = Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile_cur, 0, track, {}); CommandCost ret = Command<CMD_REMOVE_SINGLE_RAIL>::Do(flags, tile_cur, track);
if (ret.Failed()) return ret; if (ret.Failed()) return ret;
cost.AddCost(ret); cost.AddCost(ret);
/* With flags & ~DC_EXEC CmdLandscapeClear would fail since the rail still exists */ /* With flags & ~DC_EXEC CmdLandscapeClear would fail since the rail still exists */