mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-20 04:59:11 +00:00
Code Issues Activity

Fix #9925: Industry tile layout validation for layouts of only one tile

Browse Source
This commit is contained in:
Jonathan G Rennison
2022-06-18 11:08:13 +01:00
committed by Niels Martin Hansen
parent 814c61a321
commit 4acccc232a
1 changed files with 10 additions and 6 deletions

16
src/newgrf.cpp

@@ -3377,20 +3377,24 @@ static bool ValidateIndustryLayout(const IndustryTileLayout &layout)
const size_t size = layout.size(); const size_t size = layout.size();
if (size == 0) return false; if (size == 0) return false;
size_t valid_regular_tiles = 0;
for (size_t i = 0; i < size - 1; i++) { for (size_t i = 0; i < size - 1; i++) {
for (size_t j = i + 1; j < size; j++) { for (size_t j = i + 1; j < size; j++) {
if (layout[i].ti.x == layout[j].ti.x && if (layout[i].ti.x == layout[j].ti.x &&
layout[i].ti.y == layout[j].ti.y) { layout[i].ti.y == layout[j].ti.y) {
return false; return false;
} }
if (layout[i].gfx != GFX_WATERTILE_SPECIALCHECK) {
++valid_regular_tiles;
}
} }
} }
return valid_regular_tiles > 0;
bool have_regular_tile = false;
for (size_t i = 0; i < size; i++) {
if (layout[i].gfx != GFX_WATERTILE_SPECIALCHECK) {
have_regular_tile = true;
break;
}
}
return have_regular_tile;
} }
/** /**