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

(svn r3561) Don't use FindLandscapeHeightByTile() when it's overkill. Also use a sprite enum instead of a magic number.

release/0.5
tron 2006-02-06 08:15:30 +00:00
parent f7382ac78a
commit 96c81610d1
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
town_cmd.c
View File

@ -77,7 +77,7 @@ typedef struct DrawTownTileStruct {
static void TownDrawHouseLift(const TileInfo *ti) static void TownDrawHouseLift(const TileInfo *ti)
{ {
AddChildSpriteScreen(0x5A3, 0xE, 0x3C - GB(_m[ti->tile].m1, 0, 7)); AddChildSpriteScreen(SPR_LIFT, 14, 60 - GB(_m[ti->tile].m1, 0, 7));
} }
typedef void TownDrawTileProc(const TileInfo *ti); typedef void TownDrawTileProc(const TileInfo *ti);
@ -1021,7 +1021,6 @@ static Town *AllocateTown(void)
int32 CmdBuildTown(int x, int y, uint32 flags, uint32 p1, uint32 p2) int32 CmdBuildTown(int x, int y, uint32 flags, uint32 p1, uint32 p2)
{ {
TileIndex tile = TileVirtXY(x, y); TileIndex tile = TileVirtXY(x, y);
TileInfo ti;
Town *t; Town *t;
uint32 townnameparts; uint32 townnameparts;
@ -1035,9 +1034,9 @@ int32 CmdBuildTown(int x, int y, uint32 flags, uint32 p1, uint32 p2)
return_cmd_error(STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP); return_cmd_error(STR_0237_TOO_CLOSE_TO_EDGE_OF_MAP);
// Can only build on clear flat areas. // Can only build on clear flat areas.
FindLandscapeHeightByTile(&ti, tile); if (!IsTileType(tile, MP_CLEAR) || GetTileSlope(tile, NULL) != 0) {
if (ti.type != MP_CLEAR || ti.tileh != 0)
return_cmd_error(STR_0239_SITE_UNSUITABLE); return_cmd_error(STR_0239_SITE_UNSUITABLE);
}
// Check distance to all other towns. // Check distance to all other towns.
if (IsCloseToTown(tile, 20)) if (IsCloseToTown(tile, 20))
@ -1063,7 +1062,6 @@ int32 CmdBuildTown(int x, int y, uint32 flags, uint32 p1, uint32 p2)
Town *CreateRandomTown(uint attempts) Town *CreateRandomTown(uint attempts)
{ {
TileIndex tile; TileIndex tile;
TileInfo ti;
Town *t; Town *t;
uint32 townnameparts; uint32 townnameparts;
@ -1073,9 +1071,7 @@ Town *CreateRandomTown(uint attempts)
if (DistanceFromEdge(tile) < 20) continue; if (DistanceFromEdge(tile) < 20) continue;
// Make sure the tile is plain // Make sure the tile is plain
FindLandscapeHeightByTile(&ti, tile); if (!IsTileType(tile, MP_CLEAR) || GetTileSlope(tile, NULL) != 0) continue;
if (ti.type != MP_CLEAR || ti.tileh != 0)
continue;
// Check not too close to a town // Check not too close to a town
if (IsCloseToTown(tile, 20)) continue; if (IsCloseToTown(tile, 20)) continue;
@ -1562,16 +1558,16 @@ static void TownActionRoadRebuild(Town *t, int action)
static bool DoBuildStatueOfCompany(TileIndex tile) static bool DoBuildStatueOfCompany(TileIndex tile)
{ {
TileInfo ti;
PlayerID old; PlayerID old;
int32 r; int32 r;
FindLandscapeHeightByTile(&ti, tile); if (GetTileSlope(tile, NULL) != 0) return false;
if (ti.tileh != 0) return false;
if (ti.type != MP_HOUSE && ti.type != MP_CLEAR && ti.type != MP_TREES) if (!IsTileType(tile, MP_HOUSE) &&
!IsTileType(tile, MP_CLEAR) &&
!IsTileType(tile, MP_TREES)) {
return false; return false;
}
old = _current_player; old = _current_player;
_current_player = OWNER_NONE; _current_player = OWNER_NONE;