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

(svn r4270) Rename some bogus map5 to gfx

release/0.5
tron 2006-04-04 06:04:54 +00:00
parent 2ecfed2fad
commit 5f7a0a748d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
industry_cmd.c
View File

@ -75,7 +75,7 @@ typedef struct DrawIndustrySpec4Struct {
typedef struct IndustryTileTable { typedef struct IndustryTileTable {
TileIndexDiffC ti; TileIndexDiffC ti;
byte map5; byte gfx;
} IndustryTileTable; } IndustryTileTable;
typedef struct IndustrySpec { typedef struct IndustrySpec {
@ -1292,11 +1292,11 @@ static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable*
TileIndex cur_tile = tile + ToTileIndexDiff(it->ti); TileIndex cur_tile = tile + ToTileIndexDiff(it->ti);
if (!IsValidTile(cur_tile)) { if (!IsValidTile(cur_tile)) {
if (it->map5 == 0xff) continue; if (it->gfx == 0xff) continue;
return false; return false;
} }
if (it->map5 == 0xFF) { if (it->gfx == 0xFF) {
if (!IsTileType(cur_tile, MP_WATER) || if (!IsTileType(cur_tile, MP_WATER) ||
GetTileSlope(cur_tile, NULL) != 0) { GetTileSlope(cur_tile, NULL) != 0) {
return false; return false;
@ -1316,7 +1316,7 @@ static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable*
if (tileh != 0) { if (tileh != 0) {
int t; int t;
byte bits = _industry_map5_bits[it->map5]; byte bits = _industry_map5_bits[it->gfx];
if (bits & 0x10) return false; if (bits & 0x10) return false;
@ -1466,7 +1466,7 @@ static void DoCreateNewIndustry(Industry* i, TileIndex tile, int type, const Ind
do { do {
TileIndex cur_tile = tile + ToTileIndexDiff(it->ti); TileIndex cur_tile = tile + ToTileIndexDiff(it->ti);
if (it->map5 != 0xFF) { if (it->gfx != 0xFF) {
byte size; byte size;
size = it->ti.x; size = it->ti.x;
@ -1476,7 +1476,7 @@ static void DoCreateNewIndustry(Industry* i, TileIndex tile, int type, const Ind
DoCommandByTile(cur_tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); DoCommandByTile(cur_tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR);
MakeIndustry(cur_tile, i->index, it->map5); MakeIndustry(cur_tile, i->index, it->gfx);
if (_generating_world) _m[cur_tile].m1 = 0x1E; /* maturity */ if (_generating_world) _m[cur_tile].m1 = 0x1E; /* maturity */
} }
} while ((++it)->ti.x != -0x80); } while ((++it)->ti.x != -0x80);