mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r21549) -Codechange: Unfold the _build_road_button_proc array into a switch.

This commit is contained in:
alberth 2010-12-20 19:20:38 +00:00
parent 1e07f74b1e
commit 27d4a64020
1 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/road_gui.cpp
View File

@ -433,21 +433,7 @@ static void BuildRoadClick_Remove(Window *w)
SndPlayFx(SND_15_BEEP); SndPlayFx(SND_15_BEEP);
} }
/** Array with the handlers of the button-clicks for the road-toolbar */ /** Road toolbar window handler. */
static OnButtonClick * const _build_road_button_proc[] = {
BuildRoadClick_X_Dir,
BuildRoadClick_Y_Dir,
BuildRoadClick_AutoRoad,
BuildRoadClick_Demolish,
BuildRoadClick_Depot,
BuildRoadClick_BusStation,
BuildRoadClick_TruckStation,
BuildRoadClick_OneWay,
BuildRoadClick_Bridge,
BuildRoadClick_Tunnel,
BuildRoadClick_Remove
};
struct BuildRoadToolbarWindow : Window { struct BuildRoadToolbarWindow : Window {
BuildRoadToolbarWindow(const WindowDesc *desc, WindowNumber window_number) : Window() BuildRoadToolbarWindow(const WindowDesc *desc, WindowNumber window_number) : Window()
{ {
@ -529,10 +515,54 @@ struct BuildRoadToolbarWindow : Window {
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count)
{ {
if (widget >= RTW_ROAD_X) { _remove_button_clicked = false;
_remove_button_clicked = false; _one_way_button_clicked = false;
_one_way_button_clicked = false; switch (widget) {
_build_road_button_proc[widget - RTW_ROAD_X](this); case RTW_ROAD_X:
BuildRoadClick_X_Dir(this);
break;
case RTW_ROAD_Y:
BuildRoadClick_Y_Dir(this);
break;
case RTW_AUTOROAD:
BuildRoadClick_AutoRoad(this);
break;
case RTW_DEMOLISH:
BuildRoadClick_Demolish(this);
break;
case RTW_DEPOT:
BuildRoadClick_Depot(this);
break;
case RTW_BUS_STATION:
BuildRoadClick_BusStation(this);
break;
case RTW_TRUCK_STATION:
BuildRoadClick_TruckStation(this);
break;
case RTW_ONE_WAY:
BuildRoadClick_OneWay(this);
break;
case RTW_BUILD_BRIDGE:
BuildRoadClick_Bridge(this);
break;
case RTW_BUILD_TUNNEL:
BuildRoadClick_Tunnel(this);
break;
case RTW_REMOVE:
BuildRoadClick_Remove(this);
break;
default: NOT_REACHED();
} }
this->UpdateOptionWidgetStatus((RoadToolbarWidgets)widget); this->UpdateOptionWidgetStatus((RoadToolbarWidgets)widget);
if (_ctrl_pressed) RoadToolbar_CtrlChanged(this); if (_ctrl_pressed) RoadToolbar_CtrlChanged(this);