dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r4577) CodeChange : Cleanup of industry_cmd (Step-1).

Browse Source 
Add an accessor to _industry_specs array.
Work of tfc_team
This commit is contained in:
belugas
2006-04-26 14:58:06 +00:00
parent 5c7cf7d0e5
commit 8443f43d1f
2 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
industry_cmd.c
View File

@@ -235,6 +235,19 @@ IndustryType GetIndustryType(TileIndex tile)
return IT_INVALID; //we have not found equivalent, whatever the reason return IT_INVALID; //we have not found equivalent, whatever the reason
} }
/**
* Accessor for array _industry_specs.
* This will ensure at once : proper access and
* not allowing modifications of it.
* @param thistype of industry (which is the index in _industry_spec)
* @pre thistype < IT_END
**/
static const IndustrySpec *GetIndustrySpecification(IndustryType thistype)
{
assert(thistype < IT_END);
return &_industry_specs[thistype];
}
static void IndustryDrawSugarMine(const TileInfo *ti) static void IndustryDrawSugarMine(const TileInfo *ti)
{ {
const DrawIndustrySpec1Struct *d; const DrawIndustrySpec1Struct *d;
@@ -322,7 +335,7 @@ static IndustryDrawTileProc * const _industry_draw_tile_procs[5] = {
static void DrawTile_Industry(TileInfo *ti) static void DrawTile_Industry(TileInfo *ti)
{ {
const Industry* ind; const Industry *ind;
const DrawBuildingsTileStruct *dits; const DrawBuildingsTileStruct *dits;
byte z; byte z;
uint32 image, ormod; uint32 image, ormod;
@@ -374,7 +387,7 @@ static void DrawTile_Industry(TileInfo *ti)
} }
} }
static uint GetSlopeZ_Industry(const TileInfo* ti) static uint GetSlopeZ_Industry(const TileInfo *ti)
{ {
return ti->z + (ti->tileh == SLOPE_FLAT ? 0 : TILE_HEIGHT); return ti->z + (ti->tileh == SLOPE_FLAT ? 0 : TILE_HEIGHT);
} }
@@ -401,7 +414,7 @@ static void GetAcceptedCargo_Industry(TileIndex tile, AcceptedCargo ac)
static void GetTileDesc_Industry(TileIndex tile, TileDesc *td) static void GetTileDesc_Industry(TileIndex tile, TileDesc *td)
{ {
const Industry* i = GetIndustryByTile(tile); const Industry *i = GetIndustryByTile(tile);
td->owner = i->owner; td->owner = i->owner;
td->str = STR_4802_COAL_MINE + i->type; td->str = STR_4802_COAL_MINE + i->type;
@@ -413,7 +426,7 @@ static void GetTileDesc_Industry(TileIndex tile, TileDesc *td)
static int32 ClearTile_Industry(TileIndex tile, byte flags) static int32 ClearTile_Industry(TileIndex tile, byte flags)
{ {
Industry* i = GetIndustryByTile(tile); Industry *i = GetIndustryByTile(tile);
/* * water can destroy industries /* * water can destroy industries
* in editor you can bulldoze industries * in editor you can bulldoze industries
@@ -442,7 +455,7 @@ static const byte _industry_min_cargo[] = {
static void TransportIndustryGoods(TileIndex tile) static void TransportIndustryGoods(TileIndex tile)
{ {
Industry* i = GetIndustryByTile(tile); Industry *i = GetIndustryByTile(tile);
uint cw, am; uint cw, am;
cw = min(i->cargo_waiting[0], 255); cw = min(i->cargo_waiting[0], 255);
@@ -811,7 +824,7 @@ static void TileLoop_Industry(TileIndex tile)
case 143: { case 143: {
Industry* i = GetIndustryByTile(tile); Industry *i = GetIndustryByTile(tile);
if (i->was_cargo_delivered) { if (i->was_cargo_delivered) {
i->was_cargo_delivered = false; i->was_cargo_delivered = false;
SetIndustryAnimationLoop(tile, 0); SetIndustryAnimationLoop(tile, 0);
@@ -847,7 +860,7 @@ static uint32 GetTileTrackStatus_Industry(TileIndex tile, TransportType mode)
static void GetProducedCargo_Industry(TileIndex tile, CargoID *b) static void GetProducedCargo_Industry(TileIndex tile, CargoID *b)
{ {
const Industry* i = GetIndustryByTile(tile); const Industry *i = GetIndustryByTile(tile);
b[0] = i->produced_cargo[0]; b[0] = i->produced_cargo[0];
b[1] = i->produced_cargo[1]; b[1] = i->produced_cargo[1];
@@ -975,7 +988,7 @@ static void PlantFarmField(TileIndex tile)
SetupFarmFieldFence(tile + TileDiffXY(0, size_y - 1), size_x, type, AXIS_X); SetupFarmFieldFence(tile + TileDiffXY(0, size_y - 1), size_x, type, AXIS_X);
} }
static void MaybePlantFarmField(const Industry* i) static void MaybePlantFarmField(const Industry *i)
{ {
if (CHANCE16(1, 8)) { if (CHANCE16(1, 8)) {
int x = i->width / 2 + Random() % 31 - 16; int x = i->width / 2 + Random() % 31 - 16;
@@ -1225,10 +1238,10 @@ static bool CheckSuitableIndustryPos(TileIndex tile)
return true; return true;
} }
static const Town* CheckMultipleIndustryInTown(TileIndex tile, int type) static const Town *CheckMultipleIndustryInTown(TileIndex tile, int type)
{ {
const Town* t; const Town *t;
const Industry* i; const Industry *i;
t = ClosestTownFromTile(tile, (uint)-1); t = ClosestTownFromTile(tile, (uint)-1);
@@ -1271,7 +1284,7 @@ static const byte _industry_section_bits[] = {
16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
}; };
static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable* it, int type, const Town* t) static bool CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTileTable *it, int type, const Town *t)
{ {
_error_message = STR_0239_SITE_UNSUITABLE; _error_message = STR_0239_SITE_UNSUITABLE;
@@ -1347,8 +1360,8 @@ do_clear:
static bool CheckIfTooCloseToIndustry(TileIndex tile, int type) static bool CheckIfTooCloseToIndustry(TileIndex tile, int type)
{ {
const IndustrySpec* spec = &_industry_spec[type]; const IndustrySpec *spec = GetIndustrySpecification(type);
const Industry* i; const Industry *i;
// accepting industries won't be close, not even with patch // accepting industries won't be close, not even with patch
if (_patches.same_industry_close && spec->accepts_cargo[0] == CT_INVALID) if (_patches.same_industry_close && spec->accepts_cargo[0] == CT_INVALID)
@@ -1400,9 +1413,9 @@ static Industry *AllocateIndustry(void)
return AddBlockToPool(&_industry_pool) ? AllocateIndustry() : NULL; return AddBlockToPool(&_industry_pool) ? AllocateIndustry() : NULL;
} }
static void DoCreateNewIndustry(Industry* i, TileIndex tile, int type, const IndustryTileTable* it, const Town* t, byte owner) static void DoCreateNewIndustry(Industry *i, TileIndex tile, int type, const IndustryTileTable *it, const Town *t, byte owner)
{ {
const IndustrySpec *spec; const IndustrySpec *spec = GetIndustrySpecification(type);
uint32 r; uint32 r;
int j; int j;
@@ -1410,8 +1423,6 @@ static void DoCreateNewIndustry(Industry* i, TileIndex tile, int type, const Ind
i->width = i->height = 0; i->width = i->height = 0;
i->type = type; i->type = type;
spec = &_industry_spec[type];
i->produced_cargo[0] = spec->produced_cargo[0]; i->produced_cargo[0] = spec->produced_cargo[0];
i->produced_cargo[1] = spec->produced_cargo[1]; i->produced_cargo[1] = spec->produced_cargo[1];
i->accepts_cargo[0] = spec->accepts_cargo[0]; i->accepts_cargo[0] = spec->accepts_cargo[0];
@@ -1492,7 +1503,7 @@ static void DoCreateNewIndustry(Industry* i, TileIndex tile, int type, const Ind
*/ */
int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
{ {
const Town* t; const Town *t;
Industry *i; Industry *i;
int num; int num;
const IndustryTileTable * const *itt; const IndustryTileTable * const *itt;
@@ -1506,7 +1517,7 @@ int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
/* Check if the to-be built/founded industry is available for this climate. /* Check if the to-be built/founded industry is available for this climate.
* Unfortunately we have no easy way of checking, except for looping the table */ * Unfortunately we have no easy way of checking, except for looping the table */
{ {
const byte* i; const byte *i;
bool found = false; bool found = false;
for (i = &_build_industry_types[_opt_ptr->landscape][0]; i != endof(_build_industry_types[_opt_ptr->landscape]); i++) { for (i = &_build_industry_types[_opt_ptr->landscape][0]; i != endof(_build_industry_types[_opt_ptr->landscape]); i++) {
@@ -1518,7 +1529,7 @@ int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (!found) return CMD_ERROR; if (!found) return CMD_ERROR;
} }
spec = &_industry_spec[p1]; spec = GetIndustrySpecification(p1);
/* If the patch for raw-material industries is not on, you cannot build raw-material industries. /* If the patch for raw-material industries is not on, you cannot build raw-material industries.
* Raw material industries are industries that do not accept cargo (at least for now) * Raw material industries are industries that do not accept cargo (at least for now)
* Exclude the lumber mill (only "raw" industry that can be built) */ * Exclude the lumber mill (only "raw" industry that can be built) */
@@ -1556,7 +1567,7 @@ int32 CmdBuildIndustry(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
Industry *CreateNewIndustry(TileIndex tile, IndustryType type) Industry *CreateNewIndustry(TileIndex tile, IndustryType type)
{ {
const Town* t; const Town *t;
const IndustryTileTable *it; const IndustryTileTable *it;
Industry *i; Industry *i;
@@ -1564,7 +1575,7 @@ Industry *CreateNewIndustry(TileIndex tile, IndustryType type)
if (!CheckSuitableIndustryPos(tile)) return NULL; if (!CheckSuitableIndustryPos(tile)) return NULL;
spec = &_industry_spec[type]; spec = GetIndustrySpecification(type);
if (!_check_new_industry_procs[spec->check_proc](tile, type)) return NULL; if (!_check_new_industry_procs[spec->check_proc](tile, type)) return NULL;
@@ -1666,7 +1677,7 @@ static void ExtChangeIndustryProduction(Industry *i)
percent = new * 100 / old - 100; percent = new * 100 / old - 100;
i->production_rate[j] = new; i->production_rate[j] = new;
if (new >= _industry_spec[i->type].production_rate[j] / 4) if (new >= GetIndustrySpecification(i->type)->production_rate[j] / 4)
closeit = false; closeit = false;
mag = abs(percent); mag = abs(percent);

4
table/build_industry.h
View File

@@ -1081,7 +1081,7 @@ static const IndustryTileTable * const _tile_table_sugar_mine[] = {
#define MK(tbl, a,b,c, p1,p2, r1,r2, a1,a2,a3, proc) {tbl,lengthof(tbl),a,b,c,{p1,p2},{r1,r2},{a1,a2,a3},proc} #define MK(tbl, a,b,c, p1,p2, r1,r2, a1,a2,a3, proc) {tbl,lengthof(tbl),a,b,c,{p1,p2},{r1,r2},{a1,a2,a3},proc}
static const IndustrySpec _industry_spec[37] = { static const IndustrySpec _industry_specs[IT_END] = {
/* name not close to produce prodrate accepts checkproc */ /* name not close to produce prodrate accepts checkproc */
MK(_tile_table_coal_mine, 1,255,255, 1,255, 15, 0, 255,255,255, 0), MK(_tile_table_coal_mine, 1,255,255, 1,255, 15, 0, 255,255,255, 0),
MK(_tile_table_power_station, 0,255,255, 255,255, 0, 0, 1,255,255, 0), MK(_tile_table_power_station, 0,255,255, 255,255, 0, 0, 1,255,255, 0),
@@ -1123,7 +1123,7 @@ static const IndustrySpec _industry_spec[37] = {
}; };
#undef MK #undef MK
const byte _industry_type_costs[37] = { const byte _industry_type_costs[IT_END] = {
210, 30, 28, 200, 31, 240, 26, 26, 27, 250, 205, 220, 193, 26, 210, 30, 28, 200, 31, 240, 26, 26, 27, 250, 205, 220, 193, 26,
28, 208, 19, 213, 220, 225, 218, 199, 14, 26, 250, 17, 195, 26, 28, 208, 19, 213, 220, 225, 218, 199, 14, 26, 250, 17, 195, 26,
187, 193, 17, 20, 192, 22, 203, 213, 210 187, 193, 17, 20, 192, 22, 203, 213, 210