petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3658) Add functions and symbolic names to retrieve road tile types and road pieces

Browse Source
This commit is contained in:
tron
2006-02-23 08:20:28 +00:00
parent b79872366d
commit df156dacb2
5 changed files with 108 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
roadveh_cmd.c
View File

@@ -4,6 +4,7 @@
#include "openttd.h"
#include "debug.h"
#include "functions.h"
#include "road.h"
#include "table/strings.h"
#include "map.h"
#include "tile.h"
@@ -288,7 +289,7 @@ static bool EnumRoadSignalFindDepot(TileIndex tile, RoadFindDepotData *rfdd, int
tile += TileOffsByDir(_road_pf_directions[track]);
if (IsTileType(tile, MP_STREET) &&
GB(_m[tile].m5, 4, 4) == 2 &&
GetRoadType(tile) == ROAD_DEPOT &&
IsTileOwner(tile, rfdd->owner)) {
if (length < rfdd->best_length) {
@@ -978,7 +979,7 @@ static int RoadFindPathToDest(Vehicle *v, TileIndex tile, int enterdir)
}
if (IsTileType(tile, MP_STREET)) {
if (GB(_m[tile].m5, 4, 4) == 2 && IsTileOwner(tile, v->owner)) {
if (GetRoadType(tile) == ROAD_DEPOT && IsTileOwner(tile, v->owner)) {
/* Road depot */
bitmask |= _road_veh_fp_ax_or[GB(_m[tile].m5, 0, 2)];
}
@@ -1052,9 +1053,7 @@ static int RoadFindPathToDest(Vehicle *v, TileIndex tile, int enterdir)
} else {
if (IsTileType(desttile, MP_STREET)) {
m5 = _m[desttile].m5;
if ((m5 & 0xF0) == 0x20)
/* We are heading for a Depot */
goto do_it;
if (GetRoadType(desttile) == ROAD_DEPOT) goto do_it;
} else if (IsTileType(desttile, MP_STATION)) {
m5 = _m[desttile].m5;
if (IS_BYTE_INSIDE(m5, 0x43, 0x4B)) {