(svn r25837) -Codechange: Use NUM_INDUSTRYTILES_PER_GRF instead of NUM_INDUSTRYTILES to properly distinguish limits per NewGRF and limits of the pool.

-Change: [NewGRF] Lower the limit of industry tile types per NewGRF from 256 to 255 to prevent usage of ID 0xFF in Action3, and thus allowing it to become an extended byte somewhen.

1 files changed, 5 insertions, 5 deletions

diff --git a/src/newgrf.cpp b/src/newgrf.cpp
index 4115d5f1b..ae6c0b36f 100644
--- a/src/newgrf.cpp
+++ b/src/newgrf.cpp
@@ -2977,14 +2977,14 @@ static ChangeInfoResult IndustrytilesChangeInfo(uint indtid, int numinfo, int pr
 {
 	ChangeInfoResult ret = CIR_SUCCESS;
 
-	if (indtid + numinfo > NUM_INDUSTRYTILES) {
-		grfmsg(1, "IndustryTilesChangeInfo: Too many industry tiles loaded (%u), max (%u). Ignoring.", indtid + numinfo, NUM_INDUSTRYTILES);
+	if (indtid + numinfo > NUM_INDUSTRYTILES_PER_GRF) {
+		grfmsg(1, "IndustryTilesChangeInfo: Too many industry tiles loaded (%u), max (%u). Ignoring.", indtid + numinfo, NUM_INDUSTRYTILES_PER_GRF);
 		return CIR_INVALID_ID;
 	}
 
 	/* Allocate industry tile specs if they haven't been allocated already. */
 	if (_cur.grffile->indtspec == NULL) {
-		_cur.grffile->indtspec = CallocT<IndustryTileSpec*>(NUM_INDUSTRYTILES);
+		_cur.grffile->indtspec = CallocT<IndustryTileSpec*>(NUM_INDUSTRYTILES_PER_GRF);
 	}
 
 	for (int i = 0; i < numinfo; i++) {
@@ -7866,7 +7866,7 @@ static void ResetCustomIndustries()
 		}
 
 		if (indtspec == NULL) continue;
-		for (uint i = 0; i < NUM_INDUSTRYTILES; i++) {
+		for (uint i = 0; i < NUM_INDUSTRYTILES_PER_GRF; i++) {
 			free(indtspec[i]);
 		}
 
@@ -8519,7 +8519,7 @@ static void FinaliseIndustriesArray()
 		}
 
 		if (indtspec != NULL) {
-			for (int i = 0; i < NUM_INDUSTRYTILES; i++) {
+			for (int i = 0; i < NUM_INDUSTRYTILES_PER_GRF; i++) {
 				IndustryTileSpec *indtsp = indtspec[i];
 				if (indtsp != NULL) {
 					_industile_mngr.SetEntitySpec(indtsp);