(svn r12440) -Fix [FS#1694]: Make the road building and road removing conditions more union

-Feature: Allow to build/remove more road-piece combinations directly
This commit is contained in:
skidd13
2008-03-27 14:26:31 +00:00
parent 3d03eab9bc
commit b490a21e50
2 changed files with 149 additions and 116 deletions

View File

@@ -65,6 +65,20 @@ static inline RoadBits GetRoadBits(TileIndex t, RoadType rt)
}
}
/**
* Get all RoadBits set on a tile except from the given RoadType
*
* @param t The tile from which we want to get the RoadBits
* @param rt The RoadType which we exclude from the querry
* @return all set RoadBits of the tile which are not from the given RoadType
*/
static inline RoadBits GetOtherRoadBits(TileIndex t, RoadType rt)
{
return ((rt == ROADTYPE_ROAD) ? ROAD_NONE : GetRoadBits(t, ROADTYPE_ROAD)) |
((rt == ROADTYPE_TRAM) ? ROAD_NONE : GetRoadBits(t, ROADTYPE_TRAM)) |
((rt == ROADTYPE_HWAY) ? ROAD_NONE : GetRoadBits(t, ROADTYPE_HWAY));
}
/**
* Get all set RoadBits on the given tile
*