diff options
| -rw-r--r-- | docs/landscape.html | 3 | ||||
| -rw-r--r-- | docs/landscape_grid.html | 2 | ||||
| -rw-r--r-- | station_cmd.c | 6 | ||||
| -rw-r--r-- | station_map.h | 11 |
4 files changed, 10 insertions, 12 deletions
diff --git a/docs/landscape.html b/docs/landscape.html index b28a8932f..3e3d51a60 100644 --- a/docs/landscape.html +++ b/docs/landscape.html @@ -381,8 +381,7 @@ exit towards: <tt>47</tt> - NE, <tt>48</tt> - SE, <tt>49</tt> - SW, <tt>4A</tt> <li>m1: <a href="#OwnershipInfo">owner</a> of the station</li> <li>m2: index into the <a href="#_StationArray">array of stations</a></li> <li>m3 bits 0..3: <a href="#TrackType">track type</a> for railway stations, must be 0 for all the other stations</li> -<li>m3 bit 4 = use custom sprite (valid only railway stations FOR NOW)</li> -<li>m4 = custom station id</li> +<li>m4 = custom station id; 0 means standard graphics</li> </ul> </td></tr> diff --git a/docs/landscape_grid.html b/docs/landscape_grid.html index 910f028b9..f1e985eed 100644 --- a/docs/landscape_grid.html +++ b/docs/landscape_grid.html @@ -145,7 +145,7 @@ the array so you can quickly see what is used and what is not. <td class="caption">station</td> <td class="bits">XXXX XXXX</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">XXXX XXXX</td> <td class="bits">XXXX XXXX</td> <td class="bits">XXXX XXXX</td> diff --git a/station_cmd.c b/station_cmd.c index 117a0944c..b07d2c570 100644 --- a/station_cmd.c +++ b/station_cmd.c @@ -1061,7 +1061,7 @@ int32 CmdBuildRailroadStation(TileIndex tile_org, uint32 flags, uint32 p1, uint3 MakeRailStation(tile, st->owner, st->index, axis, *layout_ptr++, GB(p2, 0, 4)); - if (HASBIT(p2, 4)) SetCustomStationSprite(tile, GB(p2, 8, 8)); + if (HASBIT(p2, 4)) SetCustomStationSpecIndex(tile, GB(p2, 8, 8)); tile += tile_delta; } while (--w); @@ -1934,9 +1934,9 @@ static void DrawTile_Station(TileInfo *ti) if (ti->tileh != 0 && !IsDock(ti->tile)) DrawFoundation(ti, ti->tileh); - if (IsCustomStationSprite(ti->tile)) { + if (IsCustomStationSpecIndex(ti->tile)) { // look for customization - const StationSpec *statspec = GetCustomStation(STAT_CLASS_DFLT, GetCustomStationSprite(ti->tile)); + const StationSpec *statspec = GetCustomStation(STAT_CLASS_DFLT, GetCustomStationSpecIndex(ti->tile)); //debug("Cust-o-mized %p", statspec); diff --git a/station_map.h b/station_map.h index 8e07fd49e..847b028d8 100644 --- a/station_map.h +++ b/station_map.h @@ -218,20 +218,19 @@ static inline TileIndexDiffC GetDockOffset(TileIndex t) return dock_offset[GetDockDirection(t)]; } -static inline bool IsCustomStationSprite(TileIndex t) +static inline bool IsCustomStationSpecIndex(TileIndex t) { assert(IsTileType(t, MP_STATION)); - return HASBIT(_m[t].m3, 4); + return _m[t].m4 != 0; } -static inline void SetCustomStationSprite(TileIndex t, byte sprite) +static inline void SetCustomStationSpecIndex(TileIndex t, byte specindex) { assert(IsTileType(t, MP_STATION)); - SETBIT(_m[t].m3, 4); - _m[t].m4 = sprite; + _m[t].m4 = specindex; } -static inline uint GetCustomStationSprite(TileIndex t) +static inline uint GetCustomStationSpecIndex(TileIndex t) { assert(IsTileType(t, MP_STATION)); return _m[t].m4; |