cpp/openttd-patchpack/source Changeset - r25361:535803a9b794

Changeset - r25361:535803a9b794

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

frosch - 3 years ago 2021-05-01 21:59:53
frosch@openttd.org

Fix: [NewGRF] industry variables 65 and 66 ignored the parameter, and always used the north tile.

1 file changed with 8 insertions and 4 deletions:

src/newgrf_industries.cpp

0 comments (0 inline, 0 general)

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -281,13 +281,17 @@ static uint32 GetCountAndDistanceOfClose @@
 			if (this->tile == INVALID_TILE) break;
 			return GetClosestIndustry(this->tile, MapNewGRFIndustryType(parameter, indspec->grf_prop.grffile->grfid), this->industry);
 		/* Get town zone and Manhattan distance of closest town */
 		case 0x65:
+		case 0x65: {
 			if (this->tile == INVALID_TILE) break;
 			return GetTownRadiusGroup(this->industry->town, this->tile) << 16 | std::min(DistanceManhattan(this->tile, this->industry->town->xy), 0xFFFFu);
 			TileIndex tile = GetNearbyTile(parameter, this->tile, true);
 			return GetTownRadiusGroup(this->industry->town, tile) << 16 | std::min(DistanceManhattan(tile, this->industry->town->xy), 0xFFFFu);
+		}
 		/* Get square of Euclidian distance of closes town */
 		case 0x66:
+		case 0x66: {
 			if (this->tile == INVALID_TILE) break;
 			return GetTownRadiusGroup(this->industry->town, this->tile) << 16 | std::min(DistanceSquare(this->tile, this->industry->town->xy), 0xFFFFu);
 			TileIndex tile = GetNearbyTile(parameter, this->tile, true);
 			return GetTownRadiusGroup(this->industry->town, tile) << 16 | std::min(DistanceSquare(tile, this->industry->town->xy), 0xFFFFu);
+		}
 		/* Count of industry, distance of closest instance
 		 * 68 is the same as 67, but with a filtering on selected layout */

0 comments (0 inline, 0 general)