cpp/openttd-patchpack/source Changeset - r9278:07799d41b911

Changeset - r9278:07799d41b911

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

glx - 16 years ago 2008-05-17 17:37:44
glx@openttd.org

(svn r13144) -Codechange: make classes of the BuildRoad[Depot|Station]Window.

1 file changed with 150 insertions and 174 deletions:

src/road_gui.cpp

150

174

0 comments (0 inline, 0 general)

src/road_gui.cpp

➞

Show inline comments

@@ @@ -525,443 +525,419 @@ static void BuildRoadToolbWndProc(Window @@
 				case DDSP_PLACE_ROAD_X_DIR:
 					_place_road_flag &= ~RF_END_HALFROAD_X;
 					if (e->we.place.pt.x & 8) _place_road_flag |= RF_END_HALFROAD_X;
 					break;
 				case DDSP_PLACE_ROAD_Y_DIR:
 					_place_road_flag &= ~RF_END_HALFROAD_Y;
 					if (e->we.place.pt.y & 8) _place_road_flag |= RF_END_HALFROAD_Y;
 					break;
 				case DDSP_PLACE_AUTOROAD:
 					_place_road_flag &= ~(RF_END_HALFROAD_Y | RF_END_HALFROAD_X);
 					if (e->we.place.pt.y & 8) _place_road_flag |= RF_END_HALFROAD_Y;
 					if (e->we.place.pt.x & 8) _place_road_flag |= RF_END_HALFROAD_X;
 					/* For autoroad we need to update the
 					* direction of the road */
 					if (_thd.size.x > _thd.size.y || (_thd.size.x == _thd.size.y &&
 							( (_tile_fract_coords.x < _tile_fract_coords.y && (_tile_fract_coords.x + _tile_fract_coords.y) < 16) ||
 							(_tile_fract_coords.x > _tile_fract_coords.y && (_tile_fract_coords.x + _tile_fract_coords.y) > 16) ))) {
 						/* Set dir = X */
 						_place_road_flag &= ~RF_DIR_Y;
 					} else {
 						/* Set dir = Y */
 						_place_road_flag |= RF_DIR_Y;
+					}
 					break;
 				default:
 					break;
+			}
 			VpSelectTilesWithMethod(e->we.place.pt.x, e->we.place.pt.y, e->we.place.select_method);
 			return;
 		case WE_PLACE_MOUSEUP:
 			if (e->we.place.pt.x != -1) {
 				TileIndex start_tile = e->we.place.starttile;
 				TileIndex end_tile = e->we.place.tile;
 				switch (e->we.place.select_proc) {
 					default: NOT_REACHED();
 					case DDSP_BUILD_BRIDGE:
 						ResetObjectToPlace();
 						ShowBuildBridgeWindow(start_tile, end_tile, TRANSPORT_ROAD, RoadTypeToRoadTypes(_cur_roadtype));
 						break;
 					case DDSP_DEMOLISH_AREA:
 						GUIPlaceProcDragXY(e);
 						break;
 					case DDSP_PLACE_ROAD_X_DIR:
 					case DDSP_PLACE_ROAD_Y_DIR:
 					case DDSP_PLACE_AUTOROAD:
 						/* Flag description:
 						* Use the first three bits (0x07) if dir == Y
 						* else use the last 2 bits (X dir has
 						* not the 3rd bit set) */
 						_place_road_flag = (RoadFlags)((_place_road_flag & RF_DIR_Y) ? (_place_road_flag & 0x07) : (_place_road_flag >> 3));
 						DoCommandP(end_tile, start_tile, _place_road_flag | (_cur_roadtype << 3) | (_one_way_button_clicked << 5), CcPlaySound1D,
 							(_ctrl_pressed || _remove_button_clicked) ?
 							CMD_REMOVE_LONG_ROAD | CMD_NO_WATER | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_road) :
 							CMD_BUILD_LONG_ROAD | CMD_NO_WATER | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_road));
 						break;
+				}
+			}
 			break;
 		case WE_PLACE_PRESIZE: {
 			TileIndex tile = e->we.place.tile;
 			DoCommand(tile, 0x200 | RoadTypeToRoadTypes(_cur_roadtype), 0, DC_AUTO, CMD_BUILD_TUNNEL);
 			VpSetPresizeRange(tile, _build_tunnel_endtile == 0 ? tile : _build_tunnel_endtile);
 		} break;
 		case WE_DESTROY:
 			if (_patches.link_terraform_toolbar) DeleteWindowById(WC_SCEN_LAND_GEN, 0);
 			break;
 		case WE_CTRL_CHANGED:
 			if (RoadToolbar_CtrlChanged(w)) e->we.ctrl.cont = false;
 			break;
 		default:
 			break;
+	}
+}
 /** Widget definition of the build road toolbar */
 static const Widget _build_road_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                   STR_018B_CLOSE_WINDOW},             // RTW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   250,     0,    13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},   // RTW_CAPTION
 {  WWT_STICKYBOX,   RESIZE_NONE,     7,   251,   262,     0,    13, 0x0,                        STR_STICKY_BUTTON},                 // RTW_STICKY
 {     WWT_IMGBTN,   RESIZE_NONE,     7,     0,    21,    14,    35, SPR_IMG_ROAD_X_DIR,         STR_180B_BUILD_ROAD_SECTION},       // RTW_ROAD_X
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    22,    43,    14,    35, SPR_IMG_ROAD_Y_DIR,         STR_180B_BUILD_ROAD_SECTION},       // RTW_ROAD_Y
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    44,    65,    14,    35, SPR_IMG_AUTOROAD,           STR_BUILD_AUTOROAD_TIP},            // RTW_AUTOROAD
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    66,    87,    14,    35, SPR_IMG_DYNAMITE,           STR_018D_DEMOLISH_BUILDINGS_ETC},   // RTW_DEMOLISH
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    88,   109,    14,    35, SPR_IMG_ROAD_DEPOT,         STR_180C_BUILD_ROAD_VEHICLE_DEPOT}, // RTW_DEPOT
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   110,   131,    14,    35, SPR_IMG_BUS_STATION,        STR_180D_BUILD_BUS_STATION},        // RTW_BUS_STATION
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   132,   153,    14,    35, SPR_IMG_TRUCK_BAY,          STR_180E_BUILD_TRUCK_LOADING_BAY},  // RTW_TRUCK_STATION
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   154,   175,    14,    35, SPR_IMG_ROAD_ONE_WAY,       STR_TOGGLE_ONE_WAY_ROAD},           // RTW_ONE_WAY
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   176,   218,    14,    35, SPR_IMG_BRIDGE,             STR_180F_BUILD_ROAD_BRIDGE},        // RTW_BUILD_BRIDGE
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   219,   240,    14,    35, SPR_IMG_ROAD_TUNNEL,        STR_1810_BUILD_ROAD_TUNNEL},        // RTW_BUILD_TUNNEL
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   241,   262,    14,    35, SPR_IMG_REMOVE,             STR_1811_TOGGLE_BUILD_REMOVE_FOR},  // RTW_REMOVE
 {   WIDGETS_END},
 };
 static const WindowDesc _build_road_desc = {
 	WDP_ALIGN_TBR, 22, 263, 36, 263, 36,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_build_road_widgets,
 	BuildRoadToolbWndProc
 };
 /** Widget definition of the build tram toolbar */
 static const Widget _build_tramway_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                       STR_018B_CLOSE_WINDOW},                // RTW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   228,     0,    13, STR_WHITE_TRAMWAY_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},      // RTW_CAPTION
 {  WWT_STICKYBOX,   RESIZE_NONE,     7,   229,   240,     0,    13, 0x0,                            STR_STICKY_BUTTON},                    // RTW_STICKY
 {     WWT_IMGBTN,   RESIZE_NONE,     7,     0,    21,    14,    35, SPR_IMG_TRAMWAY_X_DIR,          STR_BUILD_TRAMWAY_SECTION},            // RTW_ROAD_X
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    22,    43,    14,    35, SPR_IMG_TRAMWAY_Y_DIR,          STR_BUILD_TRAMWAY_SECTION},            // RTW_ROAD_Y
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    44,    65,    14,    35, SPR_IMG_AUTOTRAM,               STR_BUILD_AUTOTRAM_TIP},               // RTW_AUTOROAD
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    66,    87,    14,    35, SPR_IMG_DYNAMITE,               STR_018D_DEMOLISH_BUILDINGS_ETC},      // RTW_DEMOLISH
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    88,   109,    14,    35, SPR_IMG_ROAD_DEPOT,             STR_BUILD_TRAM_VEHICLE_DEPOT},         // RTW_DEPOT
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   110,   131,    14,    35, SPR_IMG_BUS_STATION,            STR_BUILD_PASSENGER_TRAM_STATION},     // RTW_BUS_STATION
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   132,   153,    14,    35, SPR_IMG_TRUCK_BAY,              STR_BUILD_CARGO_TRAM_STATION},         // RTW_TRUCK_STATION
 {      WWT_EMPTY,   RESIZE_NONE,     0,     0,     0,     0,     0, 0x0,                            STR_NULL},                             // RTW_ONE_WAY
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   154,   196,    14,    35, SPR_IMG_BRIDGE,                 STR_BUILD_TRAMWAY_BRIDGE},             // RTW_BUILD_BRIDGE
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   197,   218,    14,    35, SPR_IMG_ROAD_TUNNEL,            STR_BUILD_TRAMWAY_TUNNEL},             // RTW_BUILD_TUNNEL
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   219,   240,    14,    35, SPR_IMG_REMOVE,                 STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS}, // RTW_REMOVE
 {   WIDGETS_END},
 };
 static const WindowDesc _build_tramway_desc = {
 	WDP_ALIGN_TBR, 22, 241, 36, 241, 36,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_build_tramway_widgets,
 	BuildRoadToolbWndProc
 };
 void ShowBuildRoadToolbar(RoadType roadtype)
+{
 	if (!IsValidPlayer(_current_player)) return;
 	_cur_roadtype = roadtype;
 	DeleteWindowByClass(WC_BUILD_TOOLBAR);
 	Window *w = AllocateWindowDescFront<Window>(roadtype == ROADTYPE_ROAD ? &_build_road_desc : &_build_tramway_desc, TRANSPORT_ROAD);
 	if (_patches.link_terraform_toolbar) ShowTerraformToolbar(w);
+}
 /** Widget definition of the build road toolbar in the scenario editor */
 static const Widget _build_road_scen_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                   STR_018B_CLOSE_WINDOW},            // RTW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   184,     0,    13, STR_1802_ROAD_CONSTRUCTION, STR_018C_WINDOW_TITLE_DRAG_THIS},  // RTW_CAPTION
 {  WWT_STICKYBOX,   RESIZE_NONE,     7,   185,   196,     0,    13, 0x0,                        STR_STICKY_BUTTON},                // RTW_STICKY
 {     WWT_IMGBTN,   RESIZE_NONE,     7,     0,    21,    14,    35, SPR_IMG_ROAD_X_DIR,         STR_180B_BUILD_ROAD_SECTION},      // RTW_ROAD_X
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    22,    43,    14,    35, SPR_IMG_ROAD_Y_DIR,         STR_180B_BUILD_ROAD_SECTION},      // RTW_ROAD_Y
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    44,    65,    14,    35, SPR_IMG_AUTOROAD,           STR_BUILD_AUTOROAD_TIP},           // RTW_AUTOROAD
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    66,    87,    14,    35, SPR_IMG_DYNAMITE,           STR_018D_DEMOLISH_BUILDINGS_ETC},  // RTW_DEMOLISH
 {      WWT_EMPTY,   RESIZE_NONE,     0,     0,     0,     0,     0, 0x0,                        STR_NULL},                         // RTW_DEPOT
 {      WWT_EMPTY,   RESIZE_NONE,     0,     0,     0,     0,     0, 0x0,                        STR_NULL},                         // RTW_BUS_STATION
 {      WWT_EMPTY,   RESIZE_NONE,     0,     0,     0,     0,     0, 0x0,                        STR_NULL},                         // RTW_TRUCK_STATION
 {     WWT_IMGBTN,   RESIZE_NONE,     7,    88,   109,    14,    35, SPR_IMG_ROAD_ONE_WAY,       STR_TOGGLE_ONE_WAY_ROAD},          // RTW_ONE_WAY
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   110,   152,    14,    35, SPR_IMG_BRIDGE,             STR_180F_BUILD_ROAD_BRIDGE},       // RTW_BUILD_BRIDGE
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   153,   174,    14,    35, SPR_IMG_ROAD_TUNNEL,        STR_1810_BUILD_ROAD_TUNNEL},       // RTW_BUILD_TUNNEL
 {     WWT_IMGBTN,   RESIZE_NONE,     7,   175,   196,    14,    35, SPR_IMG_REMOVE,             STR_1811_TOGGLE_BUILD_REMOVE_FOR}, // RTW_REMOVE
 {   WIDGETS_END},
 };
 static const WindowDesc _build_road_scen_desc = {
 	WDP_AUTO, WDP_AUTO, 197, 36, 197, 36,
 	WC_SCEN_BUILD_ROAD, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_STICKY_BUTTON,
 	_build_road_scen_widgets,
 	BuildRoadToolbWndProc
 };
 void ShowBuildRoadScenToolbar()
+{
 	_cur_roadtype = ROADTYPE_ROAD;
 	AllocateWindowDescFront<Window>(&_build_road_scen_desc, 0);
+}
 /** Enum referring to the widgets of the build road depot window */
 enum BuildRoadDepotWidgets {
 	BRDW_CLOSEBOX = 0,
 	BRDW_CAPTION,
 	BRDW_BACKGROUND,
 	BRDW_DEPOT_NE,
 	BRDW_DEPOT_SE,
 	BRDW_DEPOT_SW,
 	BRDW_DEPOT_NW,
 };
 struct BuildRoadDepotWindow : public PickerWindowBase {
 private:
 	/** Enum referring to the widgets of the build road depot window */
 	enum BuildRoadDepotWidgets {
 		BRDW_CLOSEBOX = 0,
 		BRDW_CAPTION,
 		BRDW_BACKGROUND,
 		BRDW_DEPOT_NE,
 		BRDW_DEPOT_SE,
 		BRDW_DEPOT_SW,
 		BRDW_DEPOT_NW,
 	};
 static void BuildRoadDepotWndProc(Window *w, WindowEvent *e)
+{
 	switch (e->event) {
 		case WE_CREATE:
 			w->LowerWidget(_road_depot_orientation + BRDW_DEPOT_NE);
 			break;
 		case WE_PAINT:
 			w->DrawWidgets();
 			DrawRoadDepotSprite(70, 17, DIAGDIR_NE, _cur_roadtype);
 			DrawRoadDepotSprite(70, 69, DIAGDIR_SE, _cur_roadtype);
 			DrawRoadDepotSprite( 2, 69, DIAGDIR_SW, _cur_roadtype);
 			DrawRoadDepotSprite( 2, 17, DIAGDIR_NW, _cur_roadtype);
 			break;
 public:
 	BuildRoadDepotWindow(const WindowDesc *desc) : PickerWindowBase(desc)
+	{
 		this->LowerWidget(_road_depot_orientation + BRDW_DEPOT_NE);
 		if ( _cur_roadtype == ROADTYPE_TRAM) {
 			this->widget[BRDW_CAPTION].data = STR_TRAM_DEPOT_ORIENTATION;
 			for (int i = BRDW_DEPOT_NE; i <= BRDW_DEPOT_NW; i++) this->widget[i].tooltips = STR_SELECT_TRAM_VEHICLE_DEPOT;
+		}
 		this->FindWindowPlacementAndResize(desc);
+	}
 		case WE_CLICK:
 			switch (e->we.click.widget) {
 				case BRDW_DEPOT_NW:
 				case BRDW_DEPOT_NE:
 				case BRDW_DEPOT_SW:
 				case BRDW_DEPOT_SE:
 					w->RaiseWidget(_road_depot_orientation + BRDW_DEPOT_NE);
 					_road_depot_orientation = (DiagDirection)(e->we.click.widget - BRDW_DEPOT_NE);
 					w->LowerWidget(_road_depot_orientation + BRDW_DEPOT_NE);
 					SndPlayFx(SND_15_BEEP);
 					w->SetDirty();
 					break;
 	virtual void OnPaint()
+	{
 		this->DrawWidgets();
 		DrawRoadDepotSprite(70, 17, DIAGDIR_NE, _cur_roadtype);
 		DrawRoadDepotSprite(70, 69, DIAGDIR_SE, _cur_roadtype);
 		DrawRoadDepotSprite( 2, 69, DIAGDIR_SW, _cur_roadtype);
 		DrawRoadDepotSprite( 2, 17, DIAGDIR_NW, _cur_roadtype);
+	}
 				default:
 					break;
+			}
 			break;
 	virtual void OnClick(Point pt, int widget)
+	{
 		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);
 				SndPlayFx(SND_15_BEEP);
 				this->SetDirty();
 				break;
 		case WE_DESTROY:
 			ResetObjectToPlace();
 			break;
 		default:
 			break;
 			default:
 				break;
+		}
+	}
+}
+};
 /** Widget definition of the build road depot window */
 static const Widget _build_road_depot_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},              // BRDW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   139,     0,    13, STR_1806_ROAD_DEPOT_ORIENTATION, STR_018C_WINDOW_TITLE_DRAG_THIS},    // BRDW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,     7,     0,   139,    14,   121, 0x0,                             STR_NULL},                           // BRDW_BACKGROUND
 {      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    17,    66, 0x0,                             STR_1813_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_NE
 {      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    69,   118, 0x0,                             STR_1813_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_SE
 {      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    69,   118, 0x0,                             STR_1813_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_SW
 {      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    17,    66, 0x0,                             STR_1813_SELECT_ROAD_VEHICLE_DEPOT}, // BRDW_DEPOT_NW
 {   WIDGETS_END},
 };
 /** Widget definition of the build tram depot window */
 static const Widget _build_tram_depot_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                        STR_018B_CLOSE_WINDOW},              // BRDW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   139,     0,    13, STR_TRAM_DEPOT_ORIENTATION,      STR_018C_WINDOW_TITLE_DRAG_THIS},    // BRDW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,     7,     0,   139,    14,   121, 0x0,                             STR_NULL},                           // BRDW_BACKGROUND
 {      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    17,    66, 0x0,                             STR_SELECT_TRAM_VEHICLE_DEPOT},      // BRDW_DEPOT_NE
 {      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    69,   118, 0x0,                             STR_SELECT_TRAM_VEHICLE_DEPOT},      // BRDW_DEPOT_SE
 {      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    69,   118, 0x0,                             STR_SELECT_TRAM_VEHICLE_DEPOT},      // BRDW_DEPOT_SW
 {      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    17,    66, 0x0,                             STR_SELECT_TRAM_VEHICLE_DEPOT},      // BRDW_DEPOT_NW
 {   WIDGETS_END},
 };
 static const WindowDesc _build_road_depot_desc = {
 	WDP_AUTO, WDP_AUTO, 140, 122, 140, 122,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_road_depot_widgets,
 	BuildRoadDepotWndProc
 };
 static const WindowDesc _build_tram_depot_desc = {
 	WDP_AUTO, WDP_AUTO, 140, 122, 140, 122,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_build_tram_depot_widgets,
 	BuildRoadDepotWndProc
 	NULL
 };
 static void ShowRoadDepotPicker()
+{
-	new Window(_cur_roadtype == ROADTYPE_ROAD ? &_build_road_depot_desc : &_build_tram_depot_desc);
+	new BuildRoadDepotWindow(&_build_road_depot_desc);
+}
 /** Enum referring to the widgets of the build road station window */
 enum BuildRoadStationWidgets {
 	BRSW_CLOSEBOX = 0,
 	BRSW_CAPTION,
 	BRSW_BACKGROUND,
 	BRSW_STATION_NE,
 	BRSW_STATION_SE,
 	BRSW_STATION_SW,
 	BRSW_STATION_NW,
 	BRSW_STATION_X,
 	BRSW_STATION_Y,
 	BRSW_LT_OFF,
 	BRSW_LT_ON,
 	BRSW_INFO,
 };
 struct BuildRoadStationWindow : public PickerWindowBase {
 private:
 	/** Enum referring to the widgets of the build road station window */
 	enum BuildRoadStationWidgets {
 		BRSW_CLOSEBOX = 0,
 		BRSW_CAPTION,
 		BRSW_BACKGROUND,
 		BRSW_STATION_NE,
 		BRSW_STATION_SE,
 		BRSW_STATION_SW,
 		BRSW_STATION_NW,
 		BRSW_STATION_X,
 		BRSW_STATION_Y,
 		BRSW_LT_OFF,
 		BRSW_LT_ON,
 		BRSW_INFO,
 	};
 static void RoadStationPickerWndProc(Window *w, WindowEvent *e)
+{
 	switch (e->event) {
 		case WE_CREATE:
 			/* Trams don't have non-drivethrough stations */
 			if (_cur_roadtype == ROADTYPE_TRAM && _road_station_picker_orientation < DIAGDIR_END) {
 				_road_station_picker_orientation = DIAGDIR_END;
+			}
 			w->SetWidgetsDisabledState(_cur_roadtype == ROADTYPE_TRAM,
 				BRSW_STATION_NE,
 				BRSW_STATION_SE,
 				BRSW_STATION_SW,
 				BRSW_STATION_NW,
 				WIDGET_LIST_END);
 public:
 	BuildRoadStationWindow(const WindowDesc *desc, RoadStopType rs) : PickerWindowBase(desc)
+	{
 		/* Trams don't have non-drivethrough stations */
 		if (_cur_roadtype == ROADTYPE_TRAM && _road_station_picker_orientation < DIAGDIR_END) {
 			_road_station_picker_orientation = DIAGDIR_END;
+		}
 		this->SetWidgetsDisabledState(_cur_roadtype == ROADTYPE_TRAM,
 			BRSW_STATION_NE,
 			BRSW_STATION_SE,
 			BRSW_STATION_SW,
 			BRSW_STATION_NW,
 			WIDGET_LIST_END);
 			w->LowerWidget(_road_station_picker_orientation + BRSW_STATION_NE);
 			w->LowerWidget(_station_show_coverage + BRSW_LT_OFF);
 			break;
 		this->window_class = (rs == ROADSTOP_BUS) ? WC_BUS_STATION : WC_TRUCK_STATION;
 		this->widget[BRSW_CAPTION].data = _road_type_infos[_cur_roadtype].picker_title[rs];
 		for (uint i = BRSW_STATION_NE; i < BRSW_LT_OFF; i++) this->widget[i].tooltips = _road_type_infos[_cur_roadtype].picker_tooltip[rs];
 		case WE_PAINT: {
 			w->DrawWidgets();
 		this->LowerWidget(_road_station_picker_orientation + BRSW_STATION_NE);
 		this->LowerWidget(_station_show_coverage + BRSW_LT_OFF);
 		this->FindWindowPlacementAndResize(desc);
+	}
 			if (_station_show_coverage) {
 				int rad = _patches.modified_catchment ? CA_TRUCK /* = CA_BUS */ : CA_UNMODIFIED;
 				SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
 			} else {
 				SetTileSelectSize(1, 1);
+			}
 	virtual void OnPaint()
+	{
 		this->DrawWidgets();
 			StationType st = (w->window_class == WC_BUS_STATION) ? STATION_BUS : STATION_TRUCK;
 		if (_station_show_coverage) {
 			int rad = _patches.modified_catchment ? CA_TRUCK /* = CA_BUS */ : CA_UNMODIFIED;
 			SetTileSelectBigSize(-rad, -rad, 2 * rad, 2 * rad);
 		} else {
 			SetTileSelectSize(1, 1);
+		}
 			StationPickerDrawSprite(103, 35, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 0);
 			StationPickerDrawSprite(103, 85, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 1);
 			StationPickerDrawSprite( 35, 85, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 2);
 			StationPickerDrawSprite( 35, 35, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 3);
 			StationPickerDrawSprite(171, 35, st, INVALID_RAILTYPE, _cur_roadtype, 4);
 			StationPickerDrawSprite(171, 85, st, INVALID_RAILTYPE, _cur_roadtype, 5);
 		StationType st = (this->window_class == WC_BUS_STATION) ? STATION_BUS : STATION_TRUCK;
 			int text_end = DrawStationCoverageAreaText(2, 146,
 				(w->window_class == WC_BUS_STATION) ? SCT_PASSENGERS_ONLY : SCT_NON_PASSENGERS_ONLY,
 , false);
 			text_end = DrawStationCoverageAreaText(2, text_end + 4,
 				(w->window_class == WC_BUS_STATION) ? SCT_PASSENGERS_ONLY : SCT_NON_PASSENGERS_ONLY,
 , true) + 4;
 			if (text_end > w->widget[BRSW_BACKGROUND].bottom) {
 				w->SetDirty();
 				ResizeWindowForWidget(w, BRSW_BACKGROUND, 0, text_end - w->widget[BRSW_BACKGROUND].bottom);
 				w->SetDirty();
+			}
 		} break;
 		StationPickerDrawSprite(103, 35, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 0);
 		StationPickerDrawSprite(103, 85, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 1);
 		StationPickerDrawSprite( 35, 85, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 2);
 		StationPickerDrawSprite( 35, 35, st, INVALID_RAILTYPE, ROADTYPE_ROAD, 3);
 		StationPickerDrawSprite(171, 35, st, INVALID_RAILTYPE, _cur_roadtype, 4);
 		StationPickerDrawSprite(171, 85, st, INVALID_RAILTYPE, _cur_roadtype, 5);
 		int text_end = DrawStationCoverageAreaText(2, 146,
 			(this->window_class == WC_BUS_STATION) ? SCT_PASSENGERS_ONLY : SCT_NON_PASSENGERS_ONLY,
 , false);
 		text_end = DrawStationCoverageAreaText(2, text_end + 4,
 			(this->window_class == WC_BUS_STATION) ? SCT_PASSENGERS_ONLY : SCT_NON_PASSENGERS_ONLY,
 , true) + 4;
 		if (text_end > this->widget[BRSW_BACKGROUND].bottom) {
 			this->SetDirty();
 			ResizeWindowForWidget(this, BRSW_BACKGROUND, 0, text_end - this->widget[BRSW_BACKGROUND].bottom);
 			this->SetDirty();
+		}
+	}
 		case WE_CLICK:
 			switch (e->we.click.widget) {
 				case BRSW_STATION_NE:
 				case BRSW_STATION_SE:
 				case BRSW_STATION_SW:
 				case BRSW_STATION_NW:
 				case BRSW_STATION_X:
 				case BRSW_STATION_Y:
 					w->RaiseWidget(_road_station_picker_orientation + BRSW_STATION_NE);
 					_road_station_picker_orientation = (DiagDirection)(e->we.click.widget - BRSW_STATION_NE);
 					w->LowerWidget(_road_station_picker_orientation + BRSW_STATION_NE);
 					SndPlayFx(SND_15_BEEP);
 					w->SetDirty();
 					break;
 	virtual void OnClick(Point pt, int widget)
+	{
 		switch (widget) {
 			case BRSW_STATION_NE:
 			case BRSW_STATION_SE:
 			case BRSW_STATION_SW:
 			case BRSW_STATION_NW:
 			case BRSW_STATION_X:
 			case BRSW_STATION_Y:
 				this->RaiseWidget(_road_station_picker_orientation + BRSW_STATION_NE);
 				_road_station_picker_orientation = (DiagDirection)(widget - BRSW_STATION_NE);
 				this->LowerWidget(_road_station_picker_orientation + BRSW_STATION_NE);
 				SndPlayFx(SND_15_BEEP);
 				this->SetDirty();
 				break;
 				case BRSW_LT_OFF:
 				case BRSW_LT_ON:
 					w->RaiseWidget(_station_show_coverage + BRSW_LT_OFF);
 					_station_show_coverage = (e->we.click.widget != BRSW_LT_OFF);
 					w->LowerWidget(_station_show_coverage + BRSW_LT_OFF);
 					SndPlayFx(SND_15_BEEP);
 					w->SetDirty();
 					break;
 			case BRSW_LT_OFF:
 			case BRSW_LT_ON:
 				this->RaiseWidget(_station_show_coverage + BRSW_LT_OFF);
 				_station_show_coverage = (widget != BRSW_LT_OFF);
 				this->LowerWidget(_station_show_coverage + BRSW_LT_OFF);
 				SndPlayFx(SND_15_BEEP);
 				this->SetDirty();
 				break;
 				default:
 					break;
+			}
 			break;
 		case WE_TICK:
 			CheckRedrawStationCoverage(w);
 			break;
 			default:
 				break;
+		}
+	}
 		case WE_DESTROY:
 			ResetObjectToPlace();
 			break;
 		default:
 			break;
 	virtual void OnTick()
+	{
 		CheckRedrawStationCoverage(this);
+	}
+}
+};
 /** Widget definition of the build raod station window */
 static const Widget _rv_station_picker_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,     7,     0,    10,     0,    13, STR_00C5,                         STR_018B_CLOSE_WINDOW},             // BRSW_CLOSEBOX
 {    WWT_CAPTION,   RESIZE_NONE,     7,    11,   206,     0,    13, STR_NULL,                         STR_018C_WINDOW_TITLE_DRAG_THIS},   // BRSW_CAPTION
 {      WWT_PANEL,   RESIZE_NONE,     7,     0,   206,    14,   176, 0x0,                              STR_NULL},                          // BRSW_BACKGROUND
 {      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    17,    66, 0x0,                              STR_NULL},                          // BRSW_STATION_NE
 {      WWT_PANEL,   RESIZE_NONE,    14,    71,   136,    69,   118, 0x0,                              STR_NULL},                          // BRSW_STATION_SE
 {      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    69,   118, 0x0,                              STR_NULL},                          // BRSW_STATION_SW
 {      WWT_PANEL,   RESIZE_NONE,    14,     3,    68,    17,    66, 0x0,                              STR_NULL},                          // BRSW_STATION_NW
 {      WWT_PANEL,   RESIZE_NONE,    14,   139,   204,    17,    66, 0x0,                              STR_NULL},                          // BRSW_STATION_X
 {      WWT_PANEL,   RESIZE_NONE,    14,   139,   204,    69,   118, 0x0,                              STR_NULL},                          // BRSW_STATION_Y
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,    10,    69,   133,   144, STR_02DB_OFF,                     STR_3065_DON_T_HIGHLIGHT_COVERAGE}, // BRSW_LT_OFF
 {    WWT_TEXTBTN,   RESIZE_NONE,    14,    70,   129,   133,   144, STR_02DA_ON,                      STR_3064_HIGHLIGHT_COVERAGE_AREA},  // BRSW_LT_ON
 {      WWT_LABEL,   RESIZE_NONE,     7,     0,   139,   120,   133, STR_3066_COVERAGE_AREA_HIGHLIGHT, STR_NULL},                          // BRSW_INFO
 {   WIDGETS_END},
 };
 static const WindowDesc _rv_station_picker_desc = {
 	WDP_AUTO, WDP_AUTO, 207, 177, 207, 177,
 	WC_BUS_STATION, WC_BUILD_TOOLBAR,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
 	_rv_station_picker_widgets,
-	RoadStationPickerWndProc
+	NULL
 };
 static void ShowRVStationPicker(RoadStopType rs)
+{
 	Window *w = new Window(&_rv_station_picker_desc);
 	if (w == NULL) return;
 	w->window_class = (rs == ROADSTOP_BUS) ? WC_BUS_STATION : WC_TRUCK_STATION;
 	w->widget[BRSW_CAPTION].data = _road_type_infos[_cur_roadtype].picker_title[rs];
 	for (uint i = BRSW_STATION_NE; i < BRSW_LT_OFF; i++) w->widget[i].tooltips = _road_type_infos[_cur_roadtype].picker_tooltip[rs];
 	new BuildRoadStationWindow(&_rv_station_picker_desc, rs);
+}
 void InitializeRoadGui()
+{
 	_road_depot_orientation = DIAGDIR_NW;
 	_road_station_picker_orientation = DIAGDIR_NW;
+}

0 comments (0 inline, 0 general)