mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/0.6
belugas 2007-05-30 02:08:18 +00:00
parent f8491407d0
commit 425ea50854
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/industry_cmd.cpp
View File

@ -108,12 +108,12 @@ const IndustrySpec *GetIndustrySpec(IndustryType thistype)
* This will ensure at once : proper access and * This will ensure at once : proper access and
* not allowing modifications of it. * not allowing modifications of it.
* @param gfx of industrytile (which is the index in _industry_specs) * @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 * @return a pointer to the corresponding industrytile spec
**/ **/
const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx) const IndustryTileSpec *GetIndustryTileSpec(IndustryGfx gfx)
{ {
assert(gfx < NUM_INDUSTRY_GFXES); assert(gfx < INVALID_INDUSTRYTILE);
return &_industry_tile_specs[gfx]; return &_industry_tile_specs[gfx];
} }

7
src/industry_map.h
View File

@ -48,7 +48,6 @@ enum {
GFX_BUBBLE_CATCHER = 162, GFX_BUBBLE_CATCHER = 162,
GFX_TOFFEE_QUARY = 165, GFX_TOFFEE_QUARY = 165,
GFX_SUGAR_MINE_SIEVE = 174, GFX_SUGAR_MINE_SIEVE = 174,
NUM_INDUSTRY_GFXES = 175,
}; };
/** /**
@ -201,12 +200,6 @@ static inline void ResetIndustryConstructionStage(TileIndex tile)
_m[tile].m1 = 0; _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 * Get the animation loop number
* @param tile the tile to get the animation loop number of * @param tile the tile to get the animation loop number of

2
src/table/industry_land.h
View File

@ -42,7 +42,7 @@ struct DrawIndustryCoordinates {
#define M(s1, p1, s2, p2, sx, sy, w, h, dz, p) { { s1, p1 }, { s2, p2 }, sx, sy, w - 1, h - 1, dz, p } #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 */ /** 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, 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, 0x7dc, PAL_NONE, 7, 0, 9, 9, 30, 0),
M( 0xf54, PAL_NONE, 0x7dd, PAL_NONE, 7, 0, 9, 9, 30, 0), M( 0xf54, PAL_NONE, 0x7dd, PAL_NONE, 7, 0, 9, 9, 30, 0),