mirror of
https://github.com/JGRennison/OpenTTD-patches.git
synced 2024-11-04 06:00:15 +00:00
(svn r2434) Fix some defects in r2433
This commit is contained in:
parent
0171aae109
commit
ea0f21fbcc
@ -374,7 +374,7 @@ int32 CmdBuildSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (IsLevelCrossing(tile) == 0x10 && (m5 & 0x08 ? 1 : 2) == rail_bit)
|
if (IsLevelCrossing(tile) && (m5 & 0x08 ? 1 : 2) == rail_bit)
|
||||||
return_cmd_error(STR_1007_ALREADY_BUILT);
|
return_cmd_error(STR_1007_ALREADY_BUILT);
|
||||||
/* FALLTHROUGH */
|
/* FALLTHROUGH */
|
||||||
|
|
||||||
|
@ -1841,7 +1841,7 @@ Town *ClosestTownFromTile(uint tile, uint threshold)
|
|||||||
// XXX - Fix this so for a given tiletype the owner of the type is in the same variable
|
// XXX - Fix this so for a given tiletype the owner of the type is in the same variable
|
||||||
if (IsTileType(tile, MP_HOUSE) || (
|
if (IsTileType(tile, MP_HOUSE) || (
|
||||||
IsTileType(tile, MP_STREET) &&
|
IsTileType(tile, MP_STREET) &&
|
||||||
(IsLevelCrossing(tile) ? _map3_lo[tile] == OWNER_TOWN : GetTileOwner(tile))
|
(IsLevelCrossing(tile) ? _map3_lo[tile] : GetTileOwner(tile)) == OWNER_TOWN
|
||||||
))
|
))
|
||||||
return GetTown(_map2[tile]);
|
return GetTown(_map2[tile]);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user