summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpasky <pasky@openttd.org>2004-11-26 22:29:02 +0000
committerpasky <pasky@openttd.org>2004-11-26 22:29:02 +0000
commit97c533eb9ce73885f3eba113bd1d862adbcb926a (patch)
tree798a033a387ab8dc5dc0253402ee724957413d53
parent0554031514fbdece9fa84347488b08d3cda56cf5 (diff)
downloadopenttd-97c533eb9ce73885f3eba113bd1d862adbcb926a.tar.xz
(svn r831) Remove station-specific roadbits magic. Tron already fixed road stations so that they don't give out roadbits in r780.
-rw-r--r--town_cmd.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/town_cmd.c b/town_cmd.c
index 5aa1bc2a3..e19db652c 100644
--- a/town_cmd.c
+++ b/town_cmd.c
@@ -385,20 +385,9 @@ void OnTick_Town()
}
-static inline byte GetTownRoadBitsByTile(TileIndex tile) {
- byte b = GetRoadBitsByTile(tile);
-
- /* Don't get fooled and check if we didn't hit a station.
- * That little roadstation pinkeye returns nonzero
- * GetRoadBitsByTile(), but the road doesn't really go through
- * it (nor can we extend it at that place, but it is reasonable
- * to build a road along the station). */
- return IS_TILETYPE(tile, MP_STATION) ? 0 : b;
-}
-
static byte GetTownRoadMask(TileIndex tile)
{
- byte b = GetTownRoadBitsByTile(tile);
+ byte b = GetRoadBitsByTile(tile);
byte r=0;
if (b&1) r|=10;
if (b&2) r|=5;
@@ -420,7 +409,7 @@ static bool IsRoadAllowedHere(uint tile, int dir)
for(;;) {
// Check if there already is a road at this point?
- if (GetTownRoadBitsByTile(tile) == 0) {
+ if (GetRoadBitsByTile(tile) == 0) {
// No, try to build one in the direction.
// if that fails clear the land, and if that fails exit.
// This is to make sure that we can build a road here later.
@@ -745,7 +734,7 @@ bool GrowTown(Town *t)
tile = t->xy;
ptr = _town_coord_mod;
do {
- if (GetTownRoadBitsByTile(tile) != 0) {
+ if (GetRoadBitsByTile(tile) != 0) {
int r = GrowTownAtRoad(t, tile);
_current_player = old_player;
return r;