cpp/openttd-patchpack/source File Diff

File diff r18599:781a019dd157 → r18600:daee608b9023

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -248,7 +248,7 @@ uint32 IndustryGetVariable(const Resolve @@
 		/* Get random tile bits at offset param */
 		case 0x61:
 			tile = GetNearbyTile(parameter, tile, false);
-			return (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile) == industry) ? GetIndustryRandomBits(tile) : 0;
+			return industry->TileBelongsToIndustry(tile) ? GetIndustryRandomBits(tile) : 0;
 		/* Land info of nearby tiles */
 		case 0x62: return GetNearbyIndustryTileInformation(parameter, tile, INVALID_INDUSTRY, false, object->grffile->grf_version >= 8);
@@ @@ -256,7 +256,7 @@ uint32 IndustryGetVariable(const Resolve @@
 		/* Animation stage of nearby tiles */
 		case 0x63:
 			tile = GetNearbyTile(parameter, tile, false);
-			if (IsTileType(tile, MP_INDUSTRY) && Industry::GetByTile(tile) == industry) {
+			if (industry->TileBelongsToIndustry(tile)) {
 				return GetAnimationFrame(tile);
+			}
 			return 0xFFFFFFFF;