|
@@ -79,16 +79,17 @@ void CcPlaySound1E(bool success, TileInd
|
|
|
{
|
|
|
if (success) SndPlayTileFx(SND_20_SPLAT_2, tile);
|
|
|
}
|
|
|
|
|
|
static void GenericPlaceRail(TileIndex tile, int cmd)
|
|
|
{
|
|
|
DoCommandP(tile, _cur_railtype, cmd, CcPlaySound1E,
|
|
|
DoCommandP(tile, _cur_railtype, cmd,
|
|
|
_remove_button_clicked ?
|
|
|
CMD_REMOVE_SINGLE_RAIL | CMD_MSG(STR_1012_CAN_T_REMOVE_RAILROAD_TRACK) | CMD_NO_WATER :
|
|
|
CMD_BUILD_SINGLE_RAIL | CMD_MSG(STR_1011_CAN_T_BUILD_RAILROAD_TRACK) | CMD_NO_WATER
|
|
|
CMD_BUILD_SINGLE_RAIL | CMD_MSG(STR_1011_CAN_T_BUILD_RAILROAD_TRACK) | CMD_NO_WATER,
|
|
|
CcPlaySound1E
|
|
|
);
|
|
|
}
|
|
|
|
|
|
static void PlaceRail_N(TileIndex tile)
|
|
|
{
|
|
|
int cmd = _tile_fract_coords.x > _tile_fract_coords.y ? 4 : 5;
|
|
@@ -124,13 +125,13 @@ static void PlaceRail_AutoRail(TileIndex
|
|
|
*/
|
|
|
static void PlaceExtraDepotRail(TileIndex tile, uint16 extra)
|
|
|
{
|
|
|
if (GetRailTileType(tile) != RAIL_TILE_NORMAL) return;
|
|
|
if ((GetTrackBits(tile) & GB(extra, 8, 8)) == 0) return;
|
|
|
|
|
|
DoCommandP(tile, _cur_railtype, extra & 0xFF, NULL, CMD_BUILD_SINGLE_RAIL | CMD_NO_WATER);
|
|
|
DoCommandP(tile, _cur_railtype, extra & 0xFF, CMD_BUILD_SINGLE_RAIL | CMD_NO_WATER);
|
|
|
}
|
|
|
|
|
|
/** Additional pieces of track to add at the entrance of a depot. */
|
|
|
static const uint16 _place_depot_extra[12] = {
|
|
|
0x0604, 0x2102, 0x1202, 0x0505, // First additional track for directions 0..3
|
|
|
0x2400, 0x2801, 0x1800, 0x1401, // Second additional track
|
|
@@ -155,22 +156,23 @@ void CcRailDepot(bool success, TileIndex
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static void PlaceRail_Depot(TileIndex tile)
|
|
|
{
|
|
|
DoCommandP(tile, _cur_railtype, _build_depot_direction, CcRailDepot,
|
|
|
CMD_BUILD_TRAIN_DEPOT | CMD_NO_WATER | CMD_MSG(STR_100E_CAN_T_BUILD_TRAIN_DEPOT));
|
|
|
DoCommandP(tile, _cur_railtype, _build_depot_direction,
|
|
|
CMD_BUILD_TRAIN_DEPOT | CMD_NO_WATER | CMD_MSG(STR_100E_CAN_T_BUILD_TRAIN_DEPOT),
|
|
|
CcRailDepot);
|
|
|
}
|
|
|
|
|
|
static void PlaceRail_Waypoint(TileIndex tile)
|
|
|
{
|
|
|
if (_remove_button_clicked) {
|
|
|
DoCommandP(tile, 0, 0, CcPlaySound1E, CMD_REMOVE_TRAIN_WAYPOINT | CMD_MSG(STR_CANT_REMOVE_TRAIN_WAYPOINT));
|
|
|
DoCommandP(tile, 0, 0, CMD_REMOVE_TRAIN_WAYPOINT | CMD_MSG(STR_CANT_REMOVE_TRAIN_WAYPOINT), CcPlaySound1E);
|
|
|
} else {
|
|
|
DoCommandP(tile, _cur_waypoint_type, 0, CcPlaySound1E, CMD_BUILD_TRAIN_WAYPOINT | CMD_MSG(STR_CANT_BUILD_TRAIN_WAYPOINT));
|
|
|
DoCommandP(tile, _cur_waypoint_type, 0, CMD_BUILD_TRAIN_WAYPOINT | CMD_MSG(STR_CANT_BUILD_TRAIN_WAYPOINT), CcPlaySound1E);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void CcStation(bool success, TileIndex tile, uint32 p1, uint32 p2)
|
|
|
{
|
|
|
if (success) {
|
|
@@ -188,14 +190,14 @@ static void PlaceRail_Station(TileIndex
|
|
|
} else if (_railstation.dragdrop) {
|
|
|
VpStartPlaceSizing(tile, VPM_X_AND_Y_LIMITED, DDSP_BUILD_STATION);
|
|
|
VpSetPlaceSizingLimit(_settings_game.station.station_spread);
|
|
|
} else {
|
|
|
DoCommandP(tile,
|
|
|
_railstation.orientation | (_railstation.numtracks << 8) | (_railstation.platlength << 16) | (_ctrl_pressed << 24),
|
|
|
_cur_railtype | (_railstation.station_class << 8) | (_railstation.station_type << 16), CcStation,
|
|
|
CMD_BUILD_RAILROAD_STATION | CMD_NO_WATER | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION));
|
|
|
_cur_railtype | (_railstation.station_class << 8) | (_railstation.station_type << 16),
|
|
|
CMD_BUILD_RAILROAD_STATION | CMD_NO_WATER | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION), CcStation);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Build a new signal or edit/remove a present signal, use CmdBuildSingleSignal() or CmdRemoveSingleSignal() in rail_cmd.cpp
|
|
|
*
|
|
@@ -213,14 +215,13 @@ static void GenericPlaceSignals(TileInde
|
|
|
trackbits = (_tile_fract_coords.x + _tile_fract_coords.y <= 15) ? TRACK_BIT_UPPER : TRACK_BIT_LOWER;
|
|
|
}
|
|
|
|
|
|
Track track = FindFirstTrack(trackbits);
|
|
|
|
|
|
if (_remove_button_clicked) {
|
|
|
DoCommandP(tile, track, 0, CcPlaySound1E,
|
|
|
CMD_REMOVE_SIGNALS | CMD_MSG(STR_1013_CAN_T_REMOVE_SIGNALS_FROM));
|
|
|
DoCommandP(tile, track, 0, CMD_REMOVE_SIGNALS | CMD_MSG(STR_1013_CAN_T_REMOVE_SIGNALS_FROM), CcPlaySound1E);
|
|
|
} else {
|
|
|
const Window *w = FindWindowById(WC_BUILD_SIGNAL, 0);
|
|
|
|
|
|
/* Map _patches.cycle_signal_types to the lower and upper allowed signal type. */
|
|
|
static const uint cycle_bounds[] = {SIGTYPE_NORMAL | (SIGTYPE_LAST_NOPBS << 3), SIGTYPE_PBS | (SIGTYPE_LAST << 3), SIGTYPE_NORMAL | (SIGTYPE_LAST << 3)};
|
|
|
|
|
@@ -239,14 +240,15 @@ static void GenericPlaceSignals(TileInde
|
|
|
SB(p1, 4, 1, (_cur_year < _settings_client.gui.semaphore_build_before ? SIG_SEMAPHORE : SIG_ELECTRIC));
|
|
|
SB(p1, 5, 3, _default_signal_type[_settings_client.gui.default_signal_type]);
|
|
|
SB(p1, 8, 1, 0);
|
|
|
SB(p1, 9, 6, cycle_bounds[_settings_client.gui.cycle_signal_types]);
|
|
|
}
|
|
|
|
|
|
DoCommandP(tile, p1, 0, CcPlaySound1E, CMD_BUILD_SIGNALS |
|
|
|
CMD_MSG((w != NULL && _convert_signal_button) ? STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE : STR_1010_CAN_T_BUILD_SIGNALS_HERE));
|
|
|
DoCommandP(tile, p1, 0, CMD_BUILD_SIGNALS |
|
|
|
CMD_MSG((w != NULL && _convert_signal_button) ? STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE : STR_1010_CAN_T_BUILD_SIGNALS_HERE),
|
|
|
CcPlaySound1E);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static void PlaceRail_Bridge(TileIndex tile)
|
|
|
{
|
|
|
VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_BUILD_BRIDGE);
|
|
@@ -262,14 +264,13 @@ void CcBuildRailTunnel(bool success, Til
|
|
|
SetRedErrorSquare(_build_tunnel_endtile);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static void PlaceRail_Tunnel(TileIndex tile)
|
|
|
{
|
|
|
DoCommandP(tile, _cur_railtype, 0, CcBuildRailTunnel,
|
|
|
CMD_BUILD_TUNNEL | CMD_MSG(STR_5016_CAN_T_BUILD_TUNNEL_HERE));
|
|
|
DoCommandP(tile, _cur_railtype, 0, CMD_BUILD_TUNNEL | CMD_MSG(STR_5016_CAN_T_BUILD_TUNNEL_HERE), CcBuildRailTunnel);
|
|
|
}
|
|
|
|
|
|
static void PlaceRail_ConvertRail(TileIndex tile)
|
|
|
{
|
|
|
VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_CONVERT_RAIL);
|
|
|
}
|
|
@@ -511,13 +512,13 @@ static void BuildRailClick_Convert(Windo
|
|
|
HandlePlacePushButton(w, RTW_CONVERT_RAIL, GetRailTypeInfo(_cur_railtype)->cursor.convert, VHM_RECT, PlaceRail_ConvertRail);
|
|
|
}
|
|
|
|
|
|
|
|
|
static void DoRailroadTrack(int mode)
|
|
|
{
|
|
|
DoCommandP(TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype | (mode << 4), NULL,
|
|
|
DoCommandP(TileVirtXY(_thd.selstart.x, _thd.selstart.y), TileVirtXY(_thd.selend.x, _thd.selend.y), _cur_railtype | (mode << 4),
|
|
|
_remove_button_clicked ?
|
|
|
CMD_REMOVE_RAILROAD_TRACK | CMD_NO_WATER | CMD_MSG(STR_1012_CAN_T_REMOVE_RAILROAD_TRACK) :
|
|
|
CMD_BUILD_RAILROAD_TRACK | CMD_NO_WATER | CMD_MSG(STR_1011_CAN_T_BUILD_RAILROAD_TRACK)
|
|
|
);
|
|
|
}
|
|
|
|
|
@@ -570,17 +571,16 @@ static void HandleAutoSignalPlacement()
|
|
|
/* _settings_client.gui.drag_signals_density is given as a parameter such that each user
|
|
|
* in a network game can specify his/her own signal density */
|
|
|
DoCommandP(
|
|
|
TileVirtXY(thd->selstart.x, thd->selstart.y),
|
|
|
TileVirtXY(thd->selend.x, thd->selend.y),
|
|
|
p2,
|
|
|
CcPlaySound1E,
|
|
|
_remove_button_clicked ?
|
|
|
CMD_REMOVE_SIGNAL_TRACK | CMD_NO_WATER | CMD_MSG(STR_1013_CAN_T_REMOVE_SIGNALS_FROM) :
|
|
|
CMD_BUILD_SIGNAL_TRACK | CMD_NO_WATER | CMD_MSG(STR_1010_CAN_T_BUILD_SIGNALS_HERE)
|
|
|
);
|
|
|
CMD_BUILD_SIGNAL_TRACK | CMD_NO_WATER | CMD_MSG(STR_1010_CAN_T_BUILD_SIGNALS_HERE),
|
|
|
CcPlaySound1E);
|
|
|
}
|
|
|
|
|
|
|
|
|
typedef void OnButtonClick(Window *w);
|
|
|
|
|
|
/** Data associated with a push button in the build rail toolbar window */
|
|
@@ -724,19 +724,19 @@ struct BuildRailToolbarWindow : Window {
|
|
|
|
|
|
case DDSP_DEMOLISH_AREA:
|
|
|
GUIPlaceProcDragXY(select_proc, start_tile, end_tile);
|
|
|
break;
|
|
|
|
|
|
case DDSP_CONVERT_RAIL:
|
|
|
DoCommandP(end_tile, start_tile, _cur_railtype, CcPlaySound10, CMD_CONVERT_RAIL | CMD_MSG(STR_CANT_CONVERT_RAIL));
|
|
|
DoCommandP(end_tile, start_tile, _cur_railtype, CMD_CONVERT_RAIL | CMD_MSG(STR_CANT_CONVERT_RAIL), CcPlaySound10);
|
|
|
break;
|
|
|
|
|
|
case DDSP_REMOVE_STATION:
|
|
|
case DDSP_BUILD_STATION:
|
|
|
if (_remove_button_clicked) {
|
|
|
DoCommandP(end_tile, start_tile, 0, CcPlaySound1E, CMD_REMOVE_FROM_RAILROAD_STATION | CMD_MSG(STR_CANT_REMOVE_PART_OF_STATION));
|
|
|
DoCommandP(end_tile, start_tile, 0, CMD_REMOVE_FROM_RAILROAD_STATION | CMD_MSG(STR_CANT_REMOVE_PART_OF_STATION), CcPlaySound1E);
|
|
|
break;
|
|
|
}
|
|
|
HandleStationPlacement(start_tile, end_tile);
|
|
|
break;
|
|
|
|
|
|
case DDSP_PLACE_RAIL_NE:
|
|
@@ -877,14 +877,14 @@ static void HandleStationPlacement(TileI
|
|
|
w = ex - sx + 1;
|
|
|
h = ey - sy + 1;
|
|
|
if (_railstation.orientation == AXIS_X) Swap(w, h);
|
|
|
|
|
|
DoCommandP(TileXY(sx, sy),
|
|
|
_railstation.orientation | (w << 8) | (h << 16) | (_ctrl_pressed << 24),
|
|
|
_cur_railtype | (_railstation.station_class << 8) | (_railstation.station_type << 16), CcStation,
|
|
|
CMD_BUILD_RAILROAD_STATION | CMD_NO_WATER | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION));
|
|
|
_cur_railtype | (_railstation.station_class << 8) | (_railstation.station_type << 16),
|
|
|
CMD_BUILD_RAILROAD_STATION | CMD_NO_WATER | CMD_MSG(STR_100F_CAN_T_BUILD_RAILROAD_STATION), CcStation);
|
|
|
}
|
|
|
|
|
|
struct BuildRailStationWindow : public PickerWindowBase {
|
|
|
private:
|
|
|
/** Enum referring to the widgets of the rail stations window */
|
|
|
enum BuildRailStationWidgets {
|