diff options
Diffstat (limited to 'src/road_gui.cpp')
| -rw-r--r-- | src/road_gui.cpp | 250 |
1 files changed, 125 insertions, 125 deletions
diff --git a/src/road_gui.cpp b/src/road_gui.cpp index 6c67762b6..573261a32 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -278,9 +278,9 @@ typedef void OnButtonClick(Window *w); */ static void ToggleRoadButton_Remove(Window *w) { - w->ToggleWidgetLoweredState(RTW_REMOVE); - w->SetWidgetDirty(RTW_REMOVE); - _remove_button_clicked = w->IsWidgetLowered(RTW_REMOVE); + w->ToggleWidgetLoweredState(ROTW_REMOVE); + w->SetWidgetDirty(ROTW_REMOVE); + _remove_button_clicked = w->IsWidgetLowered(ROTW_REMOVE); SetSelectionRed(_remove_button_clicked); } @@ -291,10 +291,10 @@ static void ToggleRoadButton_Remove(Window *w) */ static bool RoadToolbar_CtrlChanged(Window *w) { - if (w->IsWidgetDisabled(RTW_REMOVE)) return false; + if (w->IsWidgetDisabled(ROTW_REMOVE)) return false; /* allow ctrl to switch remove mode only for these widgets */ - for (uint i = RTW_ROAD_X; i <= RTW_AUTOROAD; i++) { + for (uint i = ROTW_ROAD_X; i <= ROTW_AUTOROAD; i++) { if (w->IsWidgetLowered(i)) { ToggleRoadButton_Remove(w); return true; @@ -312,8 +312,8 @@ struct BuildRoadToolbarWindow : Window { { this->InitNested(desc, window_number); this->SetWidgetsDisabledState(true, - RTW_REMOVE, - RTW_ONE_WAY, + ROTW_REMOVE, + ROTW_ONE_WAY, WIDGET_LIST_END); this->OnInvalidateData(); @@ -336,9 +336,9 @@ struct BuildRoadToolbarWindow : Window { { if (!gui_scope) return; this->SetWidgetsDisabledState(!CanBuildVehicleInfrastructure(VEH_ROAD), - RTW_DEPOT, - RTW_BUS_STATION, - RTW_TRUCK_STATION, + ROTW_DEPOT, + ROTW_BUS_STATION, + ROTW_TRUCK_STATION, WIDGET_LIST_END); } @@ -353,28 +353,28 @@ struct BuildRoadToolbarWindow : Window { * by the other buttons so they don't act on themselfs. * Both are only valid if they are able to apply as options. */ switch (clicked_widget) { - case RTW_REMOVE: - this->RaiseWidget(RTW_ONE_WAY); - this->SetWidgetDirty(RTW_ONE_WAY); + case ROTW_REMOVE: + this->RaiseWidget(ROTW_ONE_WAY); + this->SetWidgetDirty(ROTW_ONE_WAY); break; - case RTW_ONE_WAY: - this->RaiseWidget(RTW_REMOVE); - this->SetWidgetDirty(RTW_REMOVE); + case ROTW_ONE_WAY: + this->RaiseWidget(ROTW_REMOVE); + this->SetWidgetDirty(ROTW_REMOVE); break; - case RTW_BUS_STATION: - case RTW_TRUCK_STATION: - this->DisableWidget(RTW_ONE_WAY); - this->SetWidgetDisabledState(RTW_REMOVE, !this->IsWidgetLowered(clicked_widget)); + case ROTW_BUS_STATION: + case ROTW_TRUCK_STATION: + this->DisableWidget(ROTW_ONE_WAY); + this->SetWidgetDisabledState(ROTW_REMOVE, !this->IsWidgetLowered(clicked_widget)); break; - case RTW_ROAD_X: - case RTW_ROAD_Y: - case RTW_AUTOROAD: + case ROTW_ROAD_X: + case ROTW_ROAD_Y: + case ROTW_AUTOROAD: this->SetWidgetsDisabledState(!this->IsWidgetLowered(clicked_widget), - RTW_REMOVE, - RTW_ONE_WAY, + ROTW_REMOVE, + ROTW_ONE_WAY, WIDGET_LIST_END); break; @@ -382,12 +382,12 @@ struct BuildRoadToolbarWindow : Window { /* When any other buttons than road/station, raise and * disable the removal button */ this->SetWidgetsDisabledState(true, - RTW_REMOVE, - RTW_ONE_WAY, + ROTW_REMOVE, + ROTW_ONE_WAY, WIDGET_LIST_END); this->SetWidgetsLoweredState(false, - RTW_REMOVE, - RTW_ONE_WAY, + ROTW_REMOVE, + ROTW_ONE_WAY, WIDGET_LIST_END); break; } @@ -398,69 +398,69 @@ struct BuildRoadToolbarWindow : Window { _remove_button_clicked = false; _one_way_button_clicked = false; switch (widget) { - case RTW_ROAD_X: - HandlePlacePushButton(this, RTW_ROAD_X, _road_type_infos[_cur_roadtype].cursor_nwse, HT_RECT); + case ROTW_ROAD_X: + HandlePlacePushButton(this, ROTW_ROAD_X, _road_type_infos[_cur_roadtype].cursor_nwse, HT_RECT); this->last_started_action = widget; break; - case RTW_ROAD_Y: - HandlePlacePushButton(this, RTW_ROAD_Y, _road_type_infos[_cur_roadtype].cursor_nesw, HT_RECT); + case ROTW_ROAD_Y: + HandlePlacePushButton(this, ROTW_ROAD_Y, _road_type_infos[_cur_roadtype].cursor_nesw, HT_RECT); this->last_started_action = widget; break; - case RTW_AUTOROAD: - HandlePlacePushButton(this, RTW_AUTOROAD, _road_type_infos[_cur_roadtype].cursor_autoroad, HT_RECT); + case ROTW_AUTOROAD: + HandlePlacePushButton(this, ROTW_AUTOROAD, _road_type_infos[_cur_roadtype].cursor_autoroad, HT_RECT); this->last_started_action = widget; break; - case RTW_DEMOLISH: - HandlePlacePushButton(this, RTW_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT | HT_DIAGONAL); + case ROTW_DEMOLISH: + HandlePlacePushButton(this, ROTW_DEMOLISH, ANIMCURSOR_DEMOLISH, HT_RECT | HT_DIAGONAL); this->last_started_action = widget; break; - case RTW_DEPOT: + case ROTW_DEPOT: if (_game_mode == GM_EDITOR || !CanBuildVehicleInfrastructure(VEH_ROAD)) return; - if (HandlePlacePushButton(this, RTW_DEPOT, SPR_CURSOR_ROAD_DEPOT, HT_RECT)) { + if (HandlePlacePushButton(this, ROTW_DEPOT, SPR_CURSOR_ROAD_DEPOT, HT_RECT)) { ShowRoadDepotPicker(this); this->last_started_action = widget; } break; - case RTW_BUS_STATION: + case ROTW_BUS_STATION: if (_game_mode == GM_EDITOR || !CanBuildVehicleInfrastructure(VEH_ROAD)) return; - if (HandlePlacePushButton(this, RTW_BUS_STATION, SPR_CURSOR_BUS_STATION, HT_RECT)) { + if (HandlePlacePushButton(this, ROTW_BUS_STATION, SPR_CURSOR_BUS_STATION, HT_RECT)) { ShowRVStationPicker(this, ROADSTOP_BUS); this->last_started_action = widget; } break; - case RTW_TRUCK_STATION: + case ROTW_TRUCK_STATION: if (_game_mode == GM_EDITOR || !CanBuildVehicleInfrastructure(VEH_ROAD)) return; - if (HandlePlacePushButton(this, RTW_TRUCK_STATION, SPR_CURSOR_TRUCK_STATION, HT_RECT)) { + if (HandlePlacePushButton(this, ROTW_TRUCK_STATION, SPR_CURSOR_TRUCK_STATION, HT_RECT)) { ShowRVStationPicker(this, ROADSTOP_TRUCK); this->last_started_action = widget; } break; - case RTW_ONE_WAY: - if (this->IsWidgetDisabled(RTW_ONE_WAY)) return; + case ROTW_ONE_WAY: + if (this->IsWidgetDisabled(ROTW_ONE_WAY)) return; this->SetDirty(); - this->ToggleWidgetLoweredState(RTW_ONE_WAY); + this->ToggleWidgetLoweredState(ROTW_ONE_WAY); SetSelectionRed(false); break; - case RTW_BUILD_BRIDGE: - HandlePlacePushButton(this, RTW_BUILD_BRIDGE, SPR_CURSOR_BRIDGE, HT_RECT); + case ROTW_BUILD_BRIDGE: + HandlePlacePushButton(this, ROTW_BUILD_BRIDGE, SPR_CURSOR_BRIDGE, HT_RECT); this->last_started_action = widget; break; - case RTW_BUILD_TUNNEL: - HandlePlacePushButton(this, RTW_BUILD_TUNNEL, SPR_CURSOR_ROAD_TUNNEL, HT_SPECIAL); + case ROTW_BUILD_TUNNEL: + HandlePlacePushButton(this, ROTW_BUILD_TUNNEL, SPR_CURSOR_ROAD_TUNNEL, HT_SPECIAL); this->last_started_action = widget; break; - case RTW_REMOVE: - if (this->IsWidgetDisabled(RTW_REMOVE)) return; + case ROTW_REMOVE: + if (this->IsWidgetDisabled(ROTW_REMOVE)) return; DeleteWindowById(WC_SELECT_STATION, 0); ToggleRoadButton_Remove(this); @@ -484,50 +484,50 @@ struct BuildRoadToolbarWindow : Window { virtual void OnPlaceObject(Point pt, TileIndex tile) { - _remove_button_clicked = this->IsWidgetLowered(RTW_REMOVE); - _one_way_button_clicked = this->IsWidgetLowered(RTW_ONE_WAY); + _remove_button_clicked = this->IsWidgetLowered(ROTW_REMOVE); + _one_way_button_clicked = this->IsWidgetLowered(ROTW_ONE_WAY); switch (this->last_started_action) { - case RTW_ROAD_X: + case ROTW_ROAD_X: _place_road_flag = RF_DIR_X; if (_tile_fract_coords.x >= 8) _place_road_flag |= RF_START_HALFROAD_X; VpStartPlaceSizing(tile, VPM_FIX_Y, DDSP_PLACE_ROAD_X_DIR); break; - case RTW_ROAD_Y: + case ROTW_ROAD_Y: _place_road_flag = RF_DIR_Y; if (_tile_fract_coords.y >= 8) _place_road_flag |= RF_START_HALFROAD_Y; VpStartPlaceSizing(tile, VPM_FIX_X, DDSP_PLACE_ROAD_Y_DIR); break; - case RTW_AUTOROAD: + case ROTW_AUTOROAD: _place_road_flag = RF_NONE; if (_tile_fract_coords.x >= 8) _place_road_flag |= RF_START_HALFROAD_X; if (_tile_fract_coords.y >= 8) _place_road_flag |= RF_START_HALFROAD_Y; VpStartPlaceSizing(tile, VPM_X_OR_Y, DDSP_PLACE_AUTOROAD); break; - case RTW_DEMOLISH: + case ROTW_DEMOLISH: PlaceProc_DemolishArea(tile); break; - case RTW_DEPOT: + case ROTW_DEPOT: DoCommandP(tile, _cur_roadtype << 2 | _road_depot_orientation, 0, CMD_BUILD_ROAD_DEPOT | CMD_MSG(_road_type_infos[_cur_roadtype].err_depot), CcRoadDepot); break; - case RTW_BUS_STATION: + case ROTW_BUS_STATION: PlaceRoad_BusStation(tile); break; - case RTW_TRUCK_STATION: + case ROTW_TRUCK_STATION: PlaceRoad_TruckStation(tile); break; - case RTW_BUILD_BRIDGE: + case ROTW_BUILD_BRIDGE: PlaceRoad_Bridge(tile, this); break; - case RTW_BUILD_TUNNEL: + case ROTW_BUILD_TUNNEL: DoCommandP(tile, RoadTypeToRoadTypes(_cur_roadtype) | (TRANSPORT_ROAD << 8), 0, CMD_BUILD_TUNNEL | CMD_MSG(STR_ERROR_CAN_T_BUILD_TUNNEL_HERE), CcBuildRoadTunnel); break; @@ -540,11 +540,11 @@ struct BuildRoadToolbarWindow : Window { { this->RaiseButtons(); this->SetWidgetsDisabledState(true, - RTW_REMOVE, - RTW_ONE_WAY, + ROTW_REMOVE, + ROTW_ONE_WAY, WIDGET_LIST_END); - this->SetWidgetDirty(RTW_REMOVE); - this->SetWidgetDirty(RTW_ONE_WAY); + this->SetWidgetDirty(ROTW_REMOVE); + this->SetWidgetDirty(ROTW_ONE_WAY); DeleteWindowById(WC_BUS_STATION, TRANSPORT_ROAD); DeleteWindowById(WC_TRUCK_STATION, TRANSPORT_ROAD); @@ -664,17 +664,17 @@ struct BuildRoadToolbarWindow : Window { }; Hotkey<BuildRoadToolbarWindow> BuildRoadToolbarWindow::roadtoolbar_hotkeys[] = { - Hotkey<BuildRoadToolbarWindow>('1', "build_x", RTW_ROAD_X), - Hotkey<BuildRoadToolbarWindow>('2', "build_y", RTW_ROAD_Y), - Hotkey<BuildRoadToolbarWindow>('3', "autoroad", RTW_AUTOROAD), - Hotkey<BuildRoadToolbarWindow>('4', "demolish", RTW_DEMOLISH), - Hotkey<BuildRoadToolbarWindow>('5', "depot", RTW_DEPOT), - Hotkey<BuildRoadToolbarWindow>('6', "bus_station", RTW_BUS_STATION), - Hotkey<BuildRoadToolbarWindow>('7', "truck_station", RTW_TRUCK_STATION), - Hotkey<BuildRoadToolbarWindow>('8', "oneway", RTW_ONE_WAY), - Hotkey<BuildRoadToolbarWindow>('B', "bridge", RTW_BUILD_BRIDGE), - Hotkey<BuildRoadToolbarWindow>('T', "tunnel", RTW_BUILD_TUNNEL), - Hotkey<BuildRoadToolbarWindow>('R', "remove", RTW_REMOVE), + Hotkey<BuildRoadToolbarWindow>('1', "build_x", ROTW_ROAD_X), + Hotkey<BuildRoadToolbarWindow>('2', "build_y", ROTW_ROAD_Y), + Hotkey<BuildRoadToolbarWindow>('3', "autoroad", ROTW_AUTOROAD), + Hotkey<BuildRoadToolbarWindow>('4', "demolish", ROTW_DEMOLISH), + Hotkey<BuildRoadToolbarWindow>('5', "depot", ROTW_DEPOT), + Hotkey<BuildRoadToolbarWindow>('6', "bus_station", ROTW_BUS_STATION), + Hotkey<BuildRoadToolbarWindow>('7', "truck_station", ROTW_TRUCK_STATION), + Hotkey<BuildRoadToolbarWindow>('8', "oneway", ROTW_ONE_WAY), + Hotkey<BuildRoadToolbarWindow>('B', "bridge", ROTW_BUILD_BRIDGE), + Hotkey<BuildRoadToolbarWindow>('T', "tunnel", ROTW_BUILD_TUNNEL), + Hotkey<BuildRoadToolbarWindow>('R', "remove", ROTW_REMOVE), HOTKEY_LIST_END(BuildRoadToolbarWindow) }; Hotkey<BuildRoadToolbarWindow> *_roadtoolbar_hotkeys = BuildRoadToolbarWindow::roadtoolbar_hotkeys; @@ -687,28 +687,28 @@ static const NWidgetPart _nested_build_road_widgets[] = { NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ROAD_X), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ROAD_X), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ROAD_Y), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ROAD_Y), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_AUTOROAD), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_AUTOROAD), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_AUTOROAD, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_DEMOLISH), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_DEMOLISH), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_DEPOT), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_DEPOT), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_DEPOT, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_VEHICLE_DEPOT), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUS_STATION), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUS_STATION), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_BUS_STATION, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_BUS_STATION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_TRUCK_STATION), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_TRUCK_STATION), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRUCK_BAY, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRUCK_LOADING_BAY), NWidget(WWT_PANEL, COLOUR_DARK_GREEN, -1), SetMinimalSize(0, 22), SetFill(1, 1), EndContainer(), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ONE_WAY), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ONE_WAY), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_ONE_WAY, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUILD_BRIDGE), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUILD_BRIDGE), SetFill(0, 1), SetMinimalSize(43, 22), SetDataTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUILD_TUNNEL), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUILD_TUNNEL), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_REMOVE), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_REMOVE), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD), EndContainer(), }; @@ -727,27 +727,27 @@ static const NWidgetPart _nested_build_tramway_widgets[] = { NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ROAD_X), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ROAD_X), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRAMWAY_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ROAD_Y), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ROAD_Y), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRAMWAY_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_SECTION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_AUTOROAD), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_AUTOROAD), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_AUTOTRAM, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOTRAM), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_DEMOLISH), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_DEMOLISH), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_DEPOT), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_DEPOT), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_DEPOT, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAM_VEHICLE_DEPOT), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUS_STATION), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUS_STATION), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_BUS_STATION, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_PASSENGER_TRAM_STATION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_TRUCK_STATION), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_TRUCK_STATION), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_TRUCK_BAY, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_CARGO_TRAM_STATION), NWidget(WWT_PANEL, COLOUR_DARK_GREEN, -1), SetMinimalSize(0, 22), SetFill(1, 1), EndContainer(), - NWidget(WWT_EMPTY, COLOUR_DARK_GREEN, RTW_ONE_WAY), SetMinimalSize(0, 0), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUILD_BRIDGE), + NWidget(WWT_EMPTY, COLOUR_DARK_GREEN, ROTW_ONE_WAY), SetMinimalSize(0, 0), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUILD_BRIDGE), SetFill(0, 1), SetMinimalSize(43, 22), SetDataTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_BRIDGE), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUILD_TUNNEL), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUILD_TUNNEL), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_TRAMWAY_TUNNEL), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_REMOVE), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_REMOVE), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS), EndContainer(), }; @@ -792,22 +792,22 @@ static const NWidgetPart _nested_build_road_scen_widgets[] = { NWidget(WWT_STICKYBOX, COLOUR_DARK_GREEN), EndContainer(), NWidget(NWID_HORIZONTAL), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ROAD_X), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ROAD_X), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_X_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ROAD_Y), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ROAD_Y), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_Y_DIR, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_SECTION), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_AUTOROAD), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_AUTOROAD), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_AUTOROAD, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_AUTOROAD), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_DEMOLISH), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_DEMOLISH), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_DYNAMITE, STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC), NWidget(WWT_PANEL, COLOUR_DARK_GREEN, -1), SetMinimalSize(0, 22), SetFill(1, 1), EndContainer(), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_ONE_WAY), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_ONE_WAY), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_ONE_WAY, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_ONE_WAY_ROAD), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUILD_BRIDGE), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUILD_BRIDGE), SetFill(0, 1), SetMinimalSize(43, 22), SetDataTip(SPR_IMG_BRIDGE, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_BRIDGE), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_BUILD_TUNNEL), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_BUILD_TUNNEL), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_ROAD_TUNNEL, STR_ROAD_TOOLBAR_TOOLTIP_BUILD_ROAD_TUNNEL), - NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, RTW_REMOVE), + NWidget(WWT_IMGBTN, COLOUR_DARK_GREEN, ROTW_REMOVE), SetFill(0, 1), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_REMOVE, STR_ROAD_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR_ROAD), EndContainer(), }; @@ -843,10 +843,10 @@ struct BuildRoadDepotWindow : public PickerWindowBase { { this->CreateNestedTree(desc); - this->LowerWidget(_road_depot_orientation + BRDW_DEPOT_NE); + this->LowerWidget(_road_depot_orientation + BRODW_DEPOT_NE); if ( _cur_roadtype == ROADTYPE_TRAM) { - this->GetWidget<NWidgetCore>(BRDW_CAPTION)->widget_data = STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION; - for (int i = BRDW_DEPOT_NE; i <= BRDW_DEPOT_NW; i++) this->GetWidget<NWidgetCore>(i)->tool_tip = STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP; + this->GetWidget<NWidgetCore>(BRODW_CAPTION)->widget_data = STR_BUILD_DEPOT_TRAM_ORIENTATION_CAPTION; + for (int i = BRODW_DEPOT_NE; i <= BRODW_DEPOT_NW; i++) this->GetWidget<NWidgetCore>(i)->tool_tip = STR_BUILD_DEPOT_TRAM_ORIENTATION_SELECT_TOOLTIP; } this->FinishInitNested(desc, TRANSPORT_ROAD); @@ -854,21 +854,21 @@ struct BuildRoadDepotWindow : public PickerWindowBase { virtual void DrawWidget(const Rect &r, int widget) const { - if (!IsInsideMM(widget, BRDW_DEPOT_NE, BRDW_DEPOT_NW + 1)) return; + if (!IsInsideMM(widget, BRODW_DEPOT_NE, BRODW_DEPOT_NW + 1)) return; - DrawRoadDepotSprite(r.left - 1, r.top, (DiagDirection)(widget - BRDW_DEPOT_NE + DIAGDIR_NE), _cur_roadtype); + DrawRoadDepotSprite(r.left - 1, r.top, (DiagDirection)(widget - BRODW_DEPOT_NE + DIAGDIR_NE), _cur_roadtype); } virtual void OnClick(Point pt, int widget, int click_count) { switch (widget) { - case BRDW_DEPOT_NW: - case BRDW_DEPOT_NE: - case BRDW_DEPOT_SW: - case BRDW_DEPOT_SE: - this->RaiseWidget(_road_depot_orientation + BRDW_DEPOT_NE); - _road_depot_orientation = (DiagDirection)(widget - BRDW_DEPOT_NE); - this->LowerWidget(_road_depot_orientation + BRDW_DEPOT_NE); + case BRODW_DEPOT_NW: + case BRODW_DEPOT_NE: + case BRODW_DEPOT_SW: + case BRODW_DEPOT_SE: + this->RaiseWidget(_road_depot_orientation + BRODW_DEPOT_NE); + _road_depot_orientation = (DiagDirection)(widget - BRODW_DEPOT_NE); + this->LowerWidget(_road_depot_orientation + BRODW_DEPOT_NE); SndPlayFx(SND_15_BEEP); this->SetDirty(); break; @@ -882,25 +882,25 @@ struct BuildRoadDepotWindow : public PickerWindowBase { static const NWidgetPart _nested_build_road_depot_widgets[] = { NWidget(NWID_HORIZONTAL), NWidget(WWT_CLOSEBOX, COLOUR_DARK_GREEN), - NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, BRDW_CAPTION), SetDataTip(STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), + NWidget(WWT_CAPTION, COLOUR_DARK_GREEN, BRODW_CAPTION), SetDataTip(STR_BUILD_DEPOT_ROAD_ORIENTATION_CAPTION, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), EndContainer(), NWidget(WWT_PANEL, COLOUR_DARK_GREEN), NWidget(NWID_SPACER), SetMinimalSize(0, 3), NWidget(NWID_HORIZONTAL_LTR), NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0), NWidget(NWID_VERTICAL), - NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_NW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), + NWidget(WWT_PANEL, COLOUR_GREY, BRODW_DEPOT_NW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(0, 2), - NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_SW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), + NWidget(WWT_PANEL, COLOUR_GREY, BRODW_DEPOT_SW), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), EndContainer(), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(2, 0), NWidget(NWID_VERTICAL), - NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_NE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), + NWidget(WWT_PANEL, COLOUR_GREY, BRODW_DEPOT_NE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(0, 2), - NWidget(WWT_PANEL, COLOUR_GREY, BRDW_DEPOT_SE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), + NWidget(WWT_PANEL, COLOUR_GREY, BRODW_DEPOT_SE), SetMinimalSize(66, 50), SetDataTip(0x0, STR_BUILD_DEPOT_ROAD_ORIENTATION_SELECT_TOOLTIP), EndContainer(), EndContainer(), NWidget(NWID_SPACER), SetMinimalSize(3, 0), SetFill(1, 0), |