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

(svn r3990) Remove another call to FindLandscapeHeight()

Browse Source
This commit is contained in:
tron
2006-03-20 13:34:01 +00:00
parent 0a91b283d6
commit eb85fcb57b
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
road_cmd.c
View File

@@ -84,7 +84,6 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
// cost for removing inner/edge -roads // cost for removing inner/edge -roads
static const uint16 road_remove_cost[2] = {50, 18}; static const uint16 road_remove_cost[2] = {50, 18};
TileInfo ti;
int32 cost; int32 cost;
TileIndex tile; TileIndex tile;
PlayerID owner; PlayerID owner;
@@ -100,8 +99,7 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
if (p1 >> 4) return CMD_ERROR; if (p1 >> 4) return CMD_ERROR;
pieces = p1; pieces = p1;
FindLandscapeHeight(&ti, x, y); tile = TileVirtXY(x, y);
tile = ti.tile;
if (!IsTileType(tile, MP_STREET) && !IsTileType(tile, MP_TUNNELBRIDGE)) return CMD_ERROR; if (!IsTileType(tile, MP_STREET) && !IsTileType(tile, MP_TUNNELBRIDGE)) return CMD_ERROR;
@@ -117,12 +115,9 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
t = NULL; t = NULL;
} }
// allow deleting road under bridge
if (ti.type != MP_TUNNELBRIDGE && !EnsureNoVehicle(tile)) return CMD_ERROR;
if (!CheckAllowRemoveRoad(tile, pieces, &edge_road)) return CMD_ERROR; if (!CheckAllowRemoveRoad(tile, pieces, &edge_road)) return CMD_ERROR;
switch (ti.type) { switch (GetTileType(tile)) {
case MP_TUNNELBRIDGE: case MP_TUNNELBRIDGE:
if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) return CMD_ERROR; if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile))) return CMD_ERROR;
@@ -144,16 +139,19 @@ int32 CmdRemoveRoad(int x, int y, uint32 flags, uint32 p1, uint32 p2)
return cost; return cost;
case MP_STREET: case MP_STREET:
if (!EnsureNoVehicle(tile)) return CMD_ERROR;
// check if you're allowed to remove the street owned by a town // check if you're allowed to remove the street owned by a town
// removal allowance depends on difficulty setting // removal allowance depends on difficulty setting
if (!CheckforTownRating(flags, t, ROAD_REMOVE)) return CMD_ERROR; if (!CheckforTownRating(flags, t, ROAD_REMOVE)) return CMD_ERROR;
switch (GetRoadType(ti.tile)) { switch (GetRoadType(tile)) {
case ROAD_NORMAL: { case ROAD_NORMAL: {
RoadBits present = GetRoadBits(ti.tile); RoadBits present = GetRoadBits(tile);
RoadBits c = pieces; RoadBits c = pieces;
if (ti.tileh != 0 && (present == ROAD_Y || present == ROAD_X)) { if (GetTileSlope(tile, NULL) != 0 &&
(present == ROAD_Y || present == ROAD_X)) {
c |= (c & 0xC) >> 2; c |= (c & 0xC) >> 2;
c |= (c & 0x3) << 2; c |= (c & 0x3) << 2;
} }