Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feature: [NewGRF] Allow fixed layout up to 256 tiles per NewGRF rail station.

Browse Source 
Allow using up to 256 tile layouts in property 0E or callback 24, which defines the layout to be saved into the map.

This was originally limited to 8, because station graphics above 8 referred to other station types but that was changed in 2007.

1) More efficient than using callback 14, as that needs to be checked every time a station tile is rendered.
2) The layout does not get changed when the station is changed (this may or may not be desirable!)

Using more than 256 layouts still requires callback 14.

(cherry picked from commit 6e553410d3)
This commit is contained in:
Peter Nelson 2024-04-18 12:21:36 +01:00 committed by Jonathan G Rennison
parent c001ee507e
commit c709976703
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/newgrf.cpp
View File

@ -2035,11 +2035,11 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, cons
const uint8_t *layout = buf->ReadBytes(length * number); const uint8_t *layout = buf->ReadBytes(length * number);
statspec->layouts[length - 1][number - 1].assign(layout, layout + length * number); statspec->layouts[length - 1][number - 1].assign(layout, layout + length * number);
/* Validate tile values are only the permitted 00, 02, 04 and 06. */ /* Ensure the first bit, axis, is zero. The rest of the value is validated during rendering, as we don't know the range yet. */
for (auto &tile : statspec->layouts[length - 1][number - 1]) { for (auto &tile : statspec->layouts[length - 1][number - 1]) {
if ((tile & 6) != tile) { if ((tile & ~1U) != tile) {
GrfMsg(1, "StationChangeInfo: Invalid tile {} in layout {}x{}", tile, length, number); GrfMsg(1, "StationChangeInfo: Invalid tile {} in layout {}x{}", tile, length, number);
tile &= 6; tile &= ~1U;
} }
} }
} }

2
src/newgrf_callbacks.h
View File

@ -38,7 +38,7 @@ enum CallbackID {
/** Determine whether a newstation should be made available to build. */ /** Determine whether a newstation should be made available to build. */
CBID_STATION_AVAILABILITY = 0x13, // 8 bit callback CBID_STATION_AVAILABILITY = 0x13, // 8 bit callback
/** Choose a tile layout to draw, instead of the standard 0-7 range. */ /** Choose a tile layout to draw, instead of the standard range. */
CBID_STATION_DRAW_TILE_LAYOUT = 0x14, CBID_STATION_DRAW_TILE_LAYOUT = 0x14,
/** /**

2
src/station_cmd.cpp
View File

@ -1668,7 +1668,7 @@ CommandCost CmdBuildRailStation(TileIndex tile_org, DoCommandFlag flags, uint32_
/* As the station is not yet completely finished, the station does not yet exist. */ /* As the station is not yet completely finished, the station does not yet exist. */
uint16_t callback = GetStationCallback(CBID_STATION_BUILD_TILE_LAYOUT, platinfo, 0, statspec, nullptr, tile, rt); uint16_t callback = GetStationCallback(CBID_STATION_BUILD_TILE_LAYOUT, platinfo, 0, statspec, nullptr, tile, rt);
if (callback != CALLBACK_FAILED) { if (callback != CALLBACK_FAILED) {
if (callback < 8) { if (callback <= UINT8_MAX) {
SetStationGfx(tile, (callback & ~1) + axis); SetStationGfx(tile, (callback & ~1) + axis);
} else { } else {
ErrorUnknownCallbackResult(statspec->grf_prop.grffile->grfid, CBID_STATION_BUILD_TILE_LAYOUT, callback); ErrorUnknownCallbackResult(statspec->grf_prop.grffile->grfid, CBID_STATION_BUILD_TILE_LAYOUT, callback);