diff options
| author | Darkvater <Darkvater@openttd.org> | 2005-06-06 13:47:06 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2005-06-06 13:47:06 +0000 |
| commit | c3c69ff5cb9bf39b8fe8878f540aa8eb5df40673 (patch) | |
| tree | ac935893726bc7005c7c5ad7d411354e5b8cc0f9 /rail_gui.c | |
| parent | f87df93a7005046420d4a00ad912de253c64e7a5 (diff) | |
| download | openttd-c3c69ff5cb9bf39b8fe8878f540aa8eb5df40673.tar.xz | |
(svn r2420) - Codechange: magic number elminitation of cursorsprites.
Diffstat (limited to 'rail_gui.c')
| -rw-r--r-- | rail_gui.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/rail_gui.c b/rail_gui.c index 0d88dc50e..c3774ee77 100644 --- a/rail_gui.c +++ b/rail_gui.c @@ -214,27 +214,27 @@ static void PlaceRail_AutoSignals(uint tile) static void BuildRailClick_N(Window *w) { - HandlePlacePushButton(w, 4, _cur_railtype*4 + 0x4EF, 1, PlaceRail_N); + HandlePlacePushButton(w, 4, _cur_railtype*4 + SPR_CURSOR_NS_TRACK, 1, PlaceRail_N); } static void BuildRailClick_NE(Window *w) { - HandlePlacePushButton(w, 5, _cur_railtype*4 + 0x4F0, 1, PlaceRail_NE); + HandlePlacePushButton(w, 5, _cur_railtype*4 + SPR_CURSOR_SWNE_TRACK, 1, PlaceRail_NE); } static void BuildRailClick_E(Window *w) { - HandlePlacePushButton(w, 6, _cur_railtype*4 + 0x4F1, 1, PlaceRail_E); + HandlePlacePushButton(w, 6, _cur_railtype*4 + SPR_CURSOR_EW_TRACK, 1, PlaceRail_E); } static void BuildRailClick_NW(Window *w) { - HandlePlacePushButton(w, 7, _cur_railtype*4 + 0x4F2, 1, PlaceRail_NW); + HandlePlacePushButton(w, 7, _cur_railtype*4 + SPR_CURSOR_NWSE_TRACK, 1, PlaceRail_NW); } static void BuildRailClick_AutoRail(Window *w) { - HandlePlacePushButton(w, 8, _cur_railtype + SPR_CURSOR_AUTORAIL, VHM_RAIL, PlaceRail_AutoRail); + HandlePlacePushButton(w, 8, SPR_CURSOR_AUTORAIL + _cur_railtype, VHM_RAIL, PlaceRail_AutoRail); } static void BuildRailClick_Demolish(Window *w) @@ -242,10 +242,10 @@ static void BuildRailClick_Demolish(Window *w) HandlePlacePushButton(w, 9, ANIMCURSOR_DEMOLISH, 1, PlaceProc_DemolishArea); } -static const SpriteID _depot_cursors[] = { - 0x510, - SPR_OPENTTD_BASE + 14, - SPR_OPENTTD_BASE + 15, +static const CursorID _depot_cursors[] = { + SPR_CURSOR_RAIL_DEPOT, + SPR_CURSOR_MONO_DEPOT, + SPR_CURSOR_MAGLEV_DEPOT, }; static void BuildRailClick_Depot(Window *w) @@ -256,14 +256,14 @@ static void BuildRailClick_Depot(Window *w) static void BuildRailClick_Waypoint(Window *w) { _waypoint_count = GetCustomStationsCount(STAT_CLASS_WAYP); - if (HandlePlacePushButton(w, 11, SPR_OPENTTD_BASE + 7, 1, PlaceRail_Waypoint) + if (HandlePlacePushButton(w, 11, SPR_CURSOR_WAYPOINT, 1, PlaceRail_Waypoint) && _waypoint_count > 0) ShowBuildWaypointPicker(); } static void BuildRailClick_Station(Window *w) { - if (HandlePlacePushButton(w, 12, 0x514, 1, PlaceRail_Station)) ShowStationBuilder(); + if (HandlePlacePushButton(w, 12, SPR_CURSOR_RAIL_STATION, 1, PlaceRail_Station)) ShowStationBuilder(); } static void BuildRailClick_AutoSignals(Window *w) @@ -273,12 +273,12 @@ static void BuildRailClick_AutoSignals(Window *w) static void BuildRailClick_Bridge(Window *w) { - HandlePlacePushButton(w, 14, 0xA21, 1, PlaceRail_Bridge); + HandlePlacePushButton(w, 14, SPR_CURSOR_BRIDGE, 1, PlaceRail_Bridge); } static void BuildRailClick_Tunnel(Window *w) { - HandlePlacePushButton(w, 15, 0x982 + _cur_railtype, 3, PlaceRail_Tunnel); + HandlePlacePushButton(w, 15, SPR_CURSOR_TUNNEL_RAIL + _cur_railtype, 3, PlaceRail_Tunnel); } static void BuildRailClick_Remove(Window *w) @@ -304,7 +304,7 @@ static void BuildRailClick_Remove(Window *w) static void BuildRailClick_Convert(Window *w) { - HandlePlacePushButton(w, 17, (SPR_OPENTTD_BASE + 26) + _cur_railtype * 2, 1, PlaceRail_ConvertRail); + HandlePlacePushButton(w, 17, SPR_CURSOR_CONVERT_RAIL + _cur_railtype * 2, 1, PlaceRail_ConvertRail); } static void BuildRailClick_Landscaping(Window *w) |