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

Codechange: Use bit alignment for detecting road, rail and water depots.

pull/8480/head
J0anJosep 2020-12-27 21:10:03 +01:00
parent a3d9165eb9
commit 76039ae2c1
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/depot_map.h
View File

@ -12,24 +12,25 @@
#include "station_map.h" #include "station_map.h"
static const uint8_t DEPOT_TYPE = 0x02;
/** /**
* Check if a tile is a depot and it is a depot of the given type. * Check if a tile is a depot and it is a depot of the given type.
*/ */
inline bool IsDepotTypeTile(Tile tile, TransportType type) inline bool IsDepotTypeTile(Tile tile, TransportType type)
{ {
if (type == TRANSPORT_AIR) return IsHangarTile(tile);
if (GB(tile.m5(), 6, 2) != DEPOT_TYPE) return false;
switch (type) { switch (type) {
default: NOT_REACHED(); default: NOT_REACHED();
case TRANSPORT_RAIL: case TRANSPORT_RAIL:
return IsRailDepotTile(tile); return IsTileType(tile, MP_RAILWAY);
case TRANSPORT_ROAD: case TRANSPORT_ROAD:
return IsRoadDepotTile(tile); return IsTileType(tile, MP_ROAD);
case TRANSPORT_WATER: case TRANSPORT_WATER:
return IsShipDepotTile(tile); return IsTileType(tile, MP_WATER);
case TRANSPORT_AIR:
return IsHangarTile(tile);
} }
} }
@ -40,7 +41,11 @@ inline bool IsDepotTypeTile(Tile tile, TransportType type)
*/ */
inline bool IsDepotTile(Tile tile) inline bool IsDepotTile(Tile tile)
{ {
return IsRailDepotTile(tile) || IsRoadDepotTile(tile) || IsShipDepotTile(tile) || IsHangarTile(tile); TileType type = GetTileType(tile);
if (type == MP_STATION) return IsHangar(tile);
if (GB(tile.m5(), 6, 2) != DEPOT_TYPE) return false;
return type == MP_RAILWAY || type == MP_ROAD || type == MP_WATER;
} }
extern DepotID GetHangarIndex(TileIndex t); extern DepotID GetHangarIndex(TileIndex t);