diff options
| author | truebrain <truebrain@openttd.org> | 2011-12-16 16:23:50 +0000 |
|---|---|---|
| committer | truebrain <truebrain@openttd.org> | 2011-12-16 16:23:50 +0000 |
| commit | 98d3f11d45c879b6cb0728c7a77fab349329abe8 (patch) | |
| tree | ed784007a33a4f0320dbf07ef99b35a060f142f5 /src/widgets/road_widget.h | |
| parent | 2aa774e831ad1cb7849c998759449ef777c5c664 (diff) | |
| download | openttd-98d3f11d45c879b6cb0728c7a77fab349329abe8.tar.xz | |
(svn r23529) -Codechange: make all widget enum values unique and make them include the files they need to compile
Diffstat (limited to 'src/widgets/road_widget.h')
| -rw-r--r-- | src/widgets/road_widget.h | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/src/widgets/road_widget.h b/src/widgets/road_widget.h index f2e5f54ca..2f948dfc9 100644 --- a/src/widgets/road_widget.h +++ b/src/widgets/road_widget.h @@ -14,26 +14,28 @@ /** Widgets of the WC_SCEN_BUILD_TOOLBAR / WC_BUILD_TOOLBAR (WC_SCEN_BUILD_TOOLBAR / WC_BUILD_TOOLBAR is also used in others). */ enum RoadToolbarWidgets { - RTW_ROAD_X, - RTW_ROAD_Y, - RTW_AUTOROAD, - RTW_DEMOLISH, - RTW_DEPOT, - RTW_BUS_STATION, - RTW_TRUCK_STATION, - RTW_ONE_WAY, - RTW_BUILD_BRIDGE, - RTW_BUILD_TUNNEL, - RTW_REMOVE, + /* Name starts with RO instead of R, becuase of collision with RailToolbarWidgets */ + ROTW_ROAD_X, + ROTW_ROAD_Y, + ROTW_AUTOROAD, + ROTW_DEMOLISH, + ROTW_DEPOT, + ROTW_BUS_STATION, + ROTW_TRUCK_STATION, + ROTW_ONE_WAY, + ROTW_BUILD_BRIDGE, + ROTW_BUILD_TUNNEL, + ROTW_REMOVE, }; /** Widgets of the WC_BUILD_DEPOT (WC_BUILD_DEPOT is also used in others). */ enum BuildRoadDepotWidgets { - BRDW_CAPTION, - BRDW_DEPOT_NE, - BRDW_DEPOT_SE, - BRDW_DEPOT_SW, - BRDW_DEPOT_NW, + /* Name starts with BRO instead of BR, becuase of collision with BuildRailDepotWidgets */ + BRODW_CAPTION, + BRODW_DEPOT_NE, + BRODW_DEPOT_SE, + BRODW_DEPOT_SW, + BRODW_DEPOT_NW, }; /** Widgets of the WC_BUS_STATION / WC_TRUCK_STATION. */ |