Merge 76a35badb0 into c69fc76395

The industry tile limit was set based on the premise that action 3 ids might later be extended. They have since been extended.

Limit is now the total number of custom tiles that can be used.

src/industry_type.h

@@ -45,13 +45,13 @@ static const IndustryType NEW_INDUSTRYOFFSET     = 37;                ///< origi
 static const IndustryType NUM_INDUSTRYTYPES      = 240;               ///< total number of industry types, new and old; limited to 240 because we need some special ids like IT_INVALID, IT_AI_UNKNOWN, IT_AI_TOWN, ...
 static const IndustryType IT_INVALID             = 0xFF;
 
-static const IndustryGfx  NUM_INDUSTRYTILES_PER_GRF = 255;            ///< Maximum number of industry tiles per NewGRF; limited to 255 to allow extending Action3 with an extended byte later on.
-
 static const IndustryGfx  INDUSTRYTILE_NOANIM    = 0xFF;              ///< flag to mark industry tiles as having no animation
 static const IndustryGfx  NEW_INDUSTRYTILEOFFSET = 175;               ///< original number of tiles
 static const IndustryGfx  NUM_INDUSTRYTILES      = 512;               ///< total number of industry tiles, new and old
 static const IndustryGfx  INVALID_INDUSTRYTILE   = NUM_INDUSTRYTILES; ///< one above amount is considered invalid
 
+static const IndustryGfx  NUM_INDUSTRYTILES_PER_GRF = NUM_INDUSTRYTILES - NEW_INDUSTRYTILEOFFSET; ///< Maximum number of industry tiles per NewGRF.
+
 static const int INDUSTRY_COMPLETED = 3; ///< final stage of industry construction.
 
 static const int INDUSTRY_NUM_INPUTS = 16;  ///< Number of cargo types an industry can accept

src/rail.h

@@ -184,7 +184,7 @@ public:
 	/**
 	 * Bridge offset
 	 */
-	SpriteID bridge_offset;
+	uint8_t bridge_offset;
 
 	/**
 	 * Original railtype number to use when drawing non-newgrf railtypes, or when drawing stations.