cpp/openttd-patchpack/source Changeset - r25366:1993a0ba27b7

Changeset - r25366:1993a0ba27b7

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

Peter Nelson - 4 years ago 2021-05-01 19:28:23
peter1138@openttd.org

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

4 files changed with 29 insertions and 30 deletions:

src/newgrf.cpp

src/newgrf_station.cpp

src/newgrf_station.h

src/station_cmd.cpp

0 comments (0 inline, 0 general)

src/newgrf.cpp

➞

Show inline comments

@@ @@ -1904,13 +1904,13 @@ static ChangeInfoResult StationChangeInf @@
 				break;
+			}
 			case 0x09: // Define sprite layout
 				statspec->tiles = buf->ReadExtendedByte();
 				delete[] statspec->renderdata; // delete earlier loaded stuff
 				statspec->renderdata = new NewGRFSpriteLayout[statspec->tiles];
 				for (uint t = 0; t < statspec->tiles; t++) {
 					NewGRFSpriteLayout *dts = &statspec->renderdata[t];
 			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 < tiles; t++) {
 					NewGRFSpriteLayout *dts = &statspec->renderdata.emplace_back();
 					dts->consistent_max_offset = UINT16_MAX; // Spritesets are unknown, so no limit.
 					if (buf->HasData(4) && *(uint32*)buf->Data() == 0) {
@@ @@ -1946,6 +1946,7 @@ static ChangeInfoResult StationChangeInf @@
 					dts->Clone(tmp_layout.data());
+				}
 				break;
+			}
 			case 0x0A: { // Copy sprite layout
 				byte srcid = buf->ReadByte();
@@ @@ -1956,12 +1957,12 @@ static ChangeInfoResult StationChangeInf @@
 					continue;
+				}
 				delete[] statspec->renderdata; // delete earlier loaded stuff
 				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]);
 				statspec->renderdata.clear(); // delete earlier loaded stuff
 				statspec->renderdata.reserve(srcstatspec->renderdata.size());
 				for (const auto &it : srcstatspec->renderdata) {
 					NewGRFSpriteLayout *dts = &statspec->renderdata.emplace_back();
 					dts->Clone(&it);
+				}
 				break;
+			}
@@ @@ -2047,18 +2048,19 @@ static ChangeInfoResult StationChangeInf @@
 				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];
 				for (uint t = 0; t < statspec->tiles; t++) {
 					NewGRFSpriteLayout *dts = &statspec->renderdata[t];
 			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 < 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;
+			}
 			default:
 				ret = CIR_UNKNOWN;
@@ @@ -8370,8 +8372,6 @@ static void ResetCustomStations() @@
 			if (stations[i] == nullptr) continue;
 			StationSpec *statspec = stations[i];
 			delete[] statspec->renderdata;
 			/* Release this station */
 			delete statspec;
+		}

src/newgrf_station.cpp

➞

Show inline comments

@@ @@ -798,10 +798,10 @@ bool DrawStationTile(int x, int y, RailT @@
 	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;

src/newgrf_station.h

➞

Show inline comments

@@ @@ -112,8 +112,8 @@ enum StationRandomTrigger { @@
 /** 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}) {}
 	/**
@@ @@ -145,8 +145,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

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -2844,8 +2844,8 @@ static void DrawTile_Station(TileInfo *t @@
+				}
 				/* 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;

0 comments (0 inline, 0 general)