cpp/openttd-patchpack/source Changeset - r6749:8cd8059c8d6e

Changeset - r6749:8cd8059c8d6e

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

belugas - 17 years ago 2007-05-30 02:08:18
belugas@openttd.org

(svn r9984) -Codechange: Remove an obsolete structure and a now meaningless enum, in favor of the "real thing"

3 files changed with 3 insertions and 10 deletions:

src/industry_cmd.cpp

src/industry_map.h

src/table/industry_land.h

0 comments (0 inline, 0 general)

src/industry_cmd.cpp

➞

Show inline comments

@@ @@ -105,18 +105,18 @@ const IndustrySpec *GetIndustrySpec(Indu @@
 /**
  * Accessor for array _industry_tile_specs.
  * This will ensure at once : proper access and
  * not allowing modifications of it.
  * @param gfx of industrytile (which is the index in _industry_specs)
- * @pre gfx < NUM_INDUSTRY_GFXES
+ * @pre gfx < INVALID_INDUSTRYTILE
  * @return a pointer to the corresponding industrytile spec
  **/
 const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx)
+{
-	assert(gfx < NUM_INDUSTRY_GFXES);
+	assert(gfx < INVALID_INDUSTRYTILE);
 	return &_industry_tile_specs[gfx];
+}
 void DestroyIndustry(Industry *i)
+{
 	BEGIN_TILE_LOOP(tile_cur, i->width, i->height, i->xy);

src/industry_map.h

➞

Show inline comments

@@ @@ -45,13 +45,12 @@ enum { @@
 	GFX_PLASTIC_FOUNTAIN_ANIMATED_7    = 154,
 	GFX_PLASTIC_FOUNTAIN_ANIMATED_8    = 155,
 	GFX_BUBBLE_GENERATOR               = 161,
 	GFX_BUBBLE_CATCHER                 = 162,
 	GFX_TOFFEE_QUARY                   = 165,
 	GFX_SUGAR_MINE_SIEVE               = 174,
 	NUM_INDUSTRY_GFXES                 = 175,
 };
 /**
  * Get the industry ID of the given tile
  * @param t the tile to get the industry ID from
  * @pre IsTileType(t, MP_INDUSTRY)
@@ @@ -198,18 +197,12 @@ static inline void SetIndustryConstructi @@
 static inline void ResetIndustryConstructionStage(TileIndex tile)
+{
 	assert(IsTileType(tile, MP_INDUSTRY));
 	_m[tile].m1 = 0;
+}
 /** Structure used to make a mapping from industry gfx to industry type */
 struct IndustryTypeSolver {
 	IndustryGfx MinGfx; ///< The first gfx index for the industry type
 	IndustryGfx MaxGfx; ///< The last gfx index for the industry type
 };
 /**
  * Get the animation loop number
  * @param tile the tile to get the animation loop number of
  * @pre IsTileType(tile, MP_INDUSTRY)
  */
 static inline byte GetIndustryAnimationLoop(TileIndex tile)

src/table/industry_land.h

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ struct DrawIndustryCoordinates { @@
  * @param dz virtual height of the sprite
  * @param p this allows to specify a special drawing procedure.
  * @see DrawBuildingsTileStruct */
 #define M(s1, p1, s2, p2, sx, sy, w, h, dz, p) { { s1, p1 }, { s2, p2 }, sx, sy, w - 1, h - 1, dz, p }
 /** Structure for industry tiles drawing */
-static const DrawBuildingsTileStruct _industry_draw_tile_data[NUM_INDUSTRY_GFXES * 4] = {
+static const DrawBuildingsTileStruct _industry_draw_tile_data[NEW_INDUSTRYTILEOFFSET * 4] = {
 	M(     0xf54, PAL_NONE,      0x7db, PAL_NONE,  7,  0,  9,  9,  10, 0),
 	M(     0xf54, PAL_NONE,      0x7dc, PAL_NONE,  7,  0,  9,  9,  30, 0),
 	M(     0xf54, PAL_NONE,      0x7dd, PAL_NONE,  7,  0,  9,  9,  30, 0),
 	M(     0x7e6, PAL_NONE,      0x7dd, PAL_NONE,  7,  0,  9,  9,  30, 0),
 	M(     0x7e6, PAL_NONE,      0x7dd, PAL_NONE,  7,  0,  9,  9,  30, 0),
 	M(     0x7e6, PAL_NONE,      0x7de, PAL_NONE,  7,  0,  9,  9,  30, 0),

0 comments (0 inline, 0 general)