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

(svn r1549) Clean up some functions:

Browse Source 
uint tile -> TileIndex tile
if () cascade -> switch ()
This commit is contained in:
tron
2005-01-17 09:41:46 +00:00
parent 1644863e32
commit 7ff921855a
4 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
industry_cmd.c
View File

@@ -854,31 +854,35 @@ void DeleteIndustry(Industry *i)
static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6};
static bool IsBadFarmFieldTile(uint tile)
static bool IsBadFarmFieldTile(TileIndex tile)
{
if (IsTileType(tile, MP_CLEAR)) {
byte m5 = _map5[tile] & 0x1C;
if (m5 == 0xC || m5 == 0x10)
switch (TileType(tile)) {
case MP_CLEAR: {
byte m5 = _map5[tile] & 0x1C;
return m5 == 0xC || m5 == 0x10;
}
case MP_TREES:
return false;
default:
return true;
return false;
} else if (IsTileType(tile, MP_TREES)) {
return false;
} else {
return true;
}
}
static bool IsBadFarmFieldTile2(uint tile)
static bool IsBadFarmFieldTile2(TileIndex tile)
{
if (IsTileType(tile, MP_CLEAR)) {
byte m5 = _map5[tile] & 0x1C;
if (m5 == 0x10)
switch (TileType(tile)) {
case MP_CLEAR: {
byte m5 = _map5[tile] & 0x1C;
return m5 == 0x10;
}
case MP_TREES:
return false;
default:
return true;
return false;
} else if (IsTileType(tile, MP_TREES)) {
return false;
} else {
return true;
}
}