Mercurial > hg > openttd
changeset 4052:5db227bfbebf draft
(svn r5326) Remove the indicator bit for custom waypoint graphics, because it just contains redundant information
Yup-yup-ed by: peter1138
author | tron <tron@openttd.org> |
---|---|
date | Wed, 21 Jun 2006 11:30:28 +0000 |
parents | 1cfe19661d31 |
children | 99f951d2a2e8 |
files | docs/landscape.html docs/landscape_grid.html rail_cmd.c rail_map.h waypoint.c |
diffstat | 5 files changed, 2 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/landscape.html +++ b/docs/landscape.html @@ -142,7 +142,6 @@ <li>m1: <a href="#OwnershipInfo">owner</a> of the depot / checkpoint</li> <li>m2: For waypoints, index into the array of waypoints.</li> <li>m3 bits 0..3 = <a href="#TrackType">track type</a></li> -<li>m3 bit 4 = use custom sprite (valid only for the checkpoint)</li> <li>m4 bits 0..3 = ground type, as per m2 bits 0..3 for railway tiles.</li> </ul> </td></tr>
--- a/docs/landscape_grid.html +++ b/docs/landscape_grid.html @@ -87,7 +87,7 @@ <td class="caption">waypoint</td> <td class="bits">-inherit-</td> <td class="bits">XXXX XXXX XXXX XXXX</td> - <td class="bits"><span class="free">OOO</span>X XXXX</td> + <td class="bits"><span class="free">OOOO</span> XXXX</td> <td class="bits"><span class="free">OOOO</span> XXXX</td> <td class="bits">-inherit-</td> <td class="bits">XX<span class="free">OO O</span>XXX</td>
--- a/rail_cmd.c +++ b/rail_cmd.c @@ -1325,7 +1325,7 @@ if (ti->tileh != SLOPE_FLAT) DrawFoundation(ti, ti->tileh); - if (IsRailWaypoint(ti->tile) && IsCustomWaypoint(ti->tile)) { + if (IsRailWaypoint(ti->tile)) { // look for customization byte stat_id = GetWaypointByTile(ti->tile)->stat_id; const StationSpec *statspec = GetCustomStationSpec(STAT_CLASS_WAYP, stat_id);
--- a/rail_map.h +++ b/rail_map.h @@ -136,20 +136,6 @@ return _m[t].m5 & 1 ? TRACK_BIT_Y : TRACK_BIT_X; } -static inline void SetCustomWaypointSprite(TileIndex t) -{ - SETBIT(_m[t].m3, 4); -} - -static inline void ClearCustomWaypointSprite(TileIndex t) -{ - CLRBIT(_m[t].m3, 4); -} - -static inline bool IsCustomWaypoint(TileIndex t) -{ - return HASBIT(_m[t].m3, 4); -} static inline Axis GetWaypointAxis(TileIndex t) {
--- a/waypoint.c +++ b/waypoint.c @@ -221,13 +221,11 @@ statspec = GetCustomStationSpec(STAT_CLASS_WAYP, p1); if (statspec != NULL) { - SetCustomWaypointSprite(tile); wp->stat_id = p1; wp->grfid = statspec->grfid; wp->localidx = statspec->localidx; } else { // Specified custom graphics do not exist, so use default. - ClearCustomWaypointSprite(tile); wp->stat_id = 0; wp->grfid = 0; wp->localidx = 0;