diff options
| author | tron <tron@openttd.org> | 2005-01-07 17:02:43 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-01-07 17:02:43 +0000 |
| commit | 414ac3286b10b83d8f832c58f48f373f5130cb89 (patch) | |
| tree | e4137b60a824b45ce09f668d58520e36dba10256 /ai_shared.c | |
| parent | fe798488e6c03311cee8328398c7ce5e235f70c8 (diff) | |
| download | openttd-414ac3286b10b83d8f832c58f48f373f5130cb89.tar.xz | |
(svn r1414) Move TileIndex, TILE_MASK and GET_TILE_[XY] to map.h and turn the latter into inline functions names Tile[XY]
Diffstat (limited to 'ai_shared.c')
| -rw-r--r-- | ai_shared.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ai_shared.c b/ai_shared.c index 9558c72bd..30dc3adcb 100644 --- a/ai_shared.c +++ b/ai_shared.c @@ -15,13 +15,13 @@ int AiNew_GetRailDirection(uint tile_a, uint tile_b, uint tile_c) { int x1, x2, x3; int y1, y2, y3; - x1 = GET_TILE_X(tile_a); - x2 = GET_TILE_X(tile_b); - x3 = GET_TILE_X(tile_c); + x1 = TileX(tile_a); + x2 = TileX(tile_b); + x3 = TileX(tile_c); - y1 = GET_TILE_Y(tile_a); - y2 = GET_TILE_Y(tile_b); - y3 = GET_TILE_Y(tile_c); + y1 = TileY(tile_a); + y2 = TileY(tile_b); + y3 = TileY(tile_c); if (y1 == y2 && y2 == y3) return 0; if (x1 == x2 && x2 == x3) return 1; @@ -50,13 +50,13 @@ int AiNew_GetRoadDirection(uint tile_a, uint tile_b, uint tile_c) { int y1, y2, y3; int r; - x1 = GET_TILE_X(tile_a); - x2 = GET_TILE_X(tile_b); - x3 = GET_TILE_X(tile_c); + x1 = TileX(tile_a); + x2 = TileX(tile_b); + x3 = TileX(tile_c); - y1 = GET_TILE_Y(tile_a); - y2 = GET_TILE_Y(tile_b); - y3 = GET_TILE_Y(tile_c); + y1 = TileY(tile_a); + y2 = TileY(tile_b); + y3 = TileY(tile_c); r = 0; @@ -75,9 +75,9 @@ int AiNew_GetRoadDirection(uint tile_a, uint tile_b, uint tile_c) { // Get's the direction between 2 tiles seen from tile_a int AiNew_GetDirection(uint tile_a, uint tile_b) { - if (GET_TILE_Y(tile_a) < GET_TILE_Y(tile_b)) return 1; - if (GET_TILE_Y(tile_a) > GET_TILE_Y(tile_b)) return 3; - if (GET_TILE_X(tile_a) < GET_TILE_X(tile_b)) return 2; + if (TileY(tile_a) < TileY(tile_b)) return 1; + if (TileY(tile_a) > TileY(tile_b)) return 3; + if (TileX(tile_a) < TileX(tile_b)) return 2; return 0; } |