Codechange: Use std::vector for NewGRF station tile sprite layouts.

(cherry picked from commit a3e49178d1)
pull/259/head
Peter Nelson 3 years ago committed by Jonathan G Rennison
parent 72bc8c7595
commit da571d6481

@ -1939,13 +1939,13 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, cons
break;
}
case 0x09: // Define sprite layout
statspec->tiles = buf->ReadExtendedByte();
delete[] statspec->renderdata; // delete earlier loaded stuff
statspec->renderdata = new NewGRFSpriteLayout[statspec->tiles];
case 0x09: { // Define sprite layout
uint16 tiles = buf->ReadExtendedByte();
statspec->renderdata.clear(); // delete earlier loaded stuff
statspec->renderdata.reserve(tiles);
for (uint t = 0; t < statspec->tiles; t++) {
NewGRFSpriteLayout *dts = &statspec->renderdata[t];
for (uint t = 0; t < tiles; t++) {
NewGRFSpriteLayout *dts = &statspec->renderdata.emplace_back();
dts->consistent_max_offset = UINT16_MAX; // Spritesets are unknown, so no limit.
if (buf->HasData(4) && *(unaligned_uint32*)buf->Data() == 0) {
@ -1981,6 +1981,7 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, cons
dts->Clone(tmp_layout.data());
}
break;
}
case 0x0A: { // Copy sprite layout
byte srcid = buf->ReadByte();
@ -1991,12 +1992,12 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, cons
continue;
}
delete[] statspec->renderdata; // delete earlier loaded stuff
statspec->renderdata.clear(); // delete earlier loaded stuff
statspec->renderdata.reserve(srcstatspec->renderdata.size());
statspec->tiles = srcstatspec->tiles;
statspec->renderdata = new NewGRFSpriteLayout[statspec->tiles];
for (uint t = 0; t < statspec->tiles; t++) {
statspec->renderdata[t].Clone(&srcstatspec->renderdata[t]);
for (const auto &it : srcstatspec->renderdata) {
NewGRFSpriteLayout *dts = &statspec->renderdata.emplace_back();
dts->Clone(&it);
}
break;
}
@ -2082,18 +2083,19 @@ static ChangeInfoResult StationChangeInfo(uint stid, int numinfo, int prop, cons
statspec->animation.triggers = buf->ReadWord();
break;
case 0x1A: // Advanced sprite layout
statspec->tiles = buf->ReadExtendedByte();
delete[] statspec->renderdata; // delete earlier loaded stuff
statspec->renderdata = new NewGRFSpriteLayout[statspec->tiles];
case 0x1A: { // Advanced sprite layout
uint16 tiles = buf->ReadExtendedByte();
statspec->renderdata.clear(); // delete earlier loaded stuff
statspec->renderdata.reserve(tiles);
for (uint t = 0; t < statspec->tiles; t++) {
NewGRFSpriteLayout *dts = &statspec->renderdata[t];
for (uint t = 0; t < tiles; t++) {
NewGRFSpriteLayout *dts = &statspec->renderdata.emplace_back();
uint num_building_sprites = buf->ReadByte();
/* On error, bail out immediately. Temporary GRF data was already freed */
if (ReadSpriteLayout(buf, num_building_sprites, false, GSF_STATIONS, true, false, dts)) return CIR_DISABLED;
}
break;
}
case A0RPI_STATION_MIN_BRIDGE_HEIGHT:
if (MappedPropertyLengthMismatch(buf, 8, mapping_entry)) break;
@ -8993,8 +8995,6 @@ static void ResetCustomStations()
if (stations[i] == nullptr) continue;
StationSpec *statspec = stations[i];
delete[] statspec->renderdata;
/* Release this station */
delete statspec;
}

@ -800,10 +800,10 @@ bool DrawStationTile(int x, int y, RailType railtype, Axis axis, StationClassID
const NewGRFSpriteLayout *layout = nullptr;
DrawTileSprites tmp_rail_layout;
if (statspec->renderdata == nullptr) {
if (statspec->renderdata.empty()) {
sprites = GetStationTileLayout(STATION_RAIL, tile + axis);
} else {
layout = &statspec->renderdata[(tile < statspec->tiles) ? tile + axis : (uint)axis];
layout = &statspec->renderdata[(tile < statspec->renderdata.size()) ? tile + axis : (uint)axis];
if (!layout->NeedsPreprocessing()) {
sprites = layout;
layout = nullptr;

@ -119,8 +119,8 @@ enum StationSpecIntlFlags {
/** Station specification. */
struct StationSpec {
StationSpec() : cls_id(STAT_CLASS_DFLT), name(0),
disallowed_platforms(0), disallowed_lengths(0), tiles(0),
renderdata(nullptr), cargo_threshold(0), cargo_triggers(0),
disallowed_platforms(0), disallowed_lengths(0),
cargo_threshold(0), cargo_triggers(0),
callback_mask(0), flags(0), pylons(0), wires(0), blocked(0),
animation({0, 0, 0, 0}), internal_flags(0) {}
/**
@ -152,8 +152,7 @@ struct StationSpec {
* 4-5 = platform with roof, left side
* 6-7 = platform with roof, right side
*/
uint tiles;
NewGRFSpriteLayout *renderdata; ///< Array of tile layouts.
std::vector<NewGRFSpriteLayout> renderdata; ///< Array of tile layouts.
/**
* Cargo threshold for choosing between little and lots of cargo

@ -3087,8 +3087,8 @@ static void DrawTile_Station(TileInfo *ti, DrawTileProcParams params)
}
/* Ensure the chosen tile layout is valid for this custom station */
if (statspec->renderdata != nullptr) {
layout = &statspec->renderdata[tile_layout < statspec->tiles ? tile_layout : (uint)GetRailStationAxis(ti->tile)];
if (!statspec->renderdata.empty()) {
layout = &statspec->renderdata[tile_layout < statspec->renderdata.size() ? tile_layout : (uint)GetRailStationAxis(ti->tile)];
if (!layout->NeedsPreprocessing()) {
t = layout;
layout = nullptr;

Loading…
Cancel
Save