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

(svn r5080) -Fix: RVs can enter other player's depot or roadstop (introduced by YAPF related change of GetTileTrackStatus() - r4419)

release/0.5
KUDr 2006-06-02 19:29:11 +00:00
parent b2eb885ab4
commit 47bf194723
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
roadveh_cmd.c
View File

@ -50,10 +50,6 @@ static const uint16 _roadveh_full_adder[63] = {
}; };
static const uint16 _road_veh_fp_ax_or[4] = {
0x100,0x200,1,2,
};
static const uint16 _road_veh_fp_ax_and[4] = { static const uint16 _road_veh_fp_ax_and[4] = {
0x1009, 0x16, 0x520, 0x2A00 0x1009, 0x16, 0x520, 0x2A00
}; };
@ -1022,20 +1018,27 @@ static int RoadFindPathToDest(Vehicle* v, TileIndex tile, DiagDirection enterdir
} }
if (IsTileType(tile, MP_STREET)) { if (IsTileType(tile, MP_STREET)) {
if (GetRoadTileType(tile) == ROAD_TILE_DEPOT && IsTileOwner(tile, v->owner)) { if (GetRoadTileType(tile) == ROAD_TILE_DEPOT && !IsTileOwner(tile, v->owner)) {
/* Road depot */ /* Road depot owned by another player */
bitmask |= _road_veh_fp_ax_or[GetRoadDepotDirection(tile)]; bitmask = 0;
} }
} else if (IsTileType(tile, MP_STATION) && IsRoadStopTile(tile)) { } else if (IsTileType(tile, MP_STATION) && IsRoadStopTile(tile)) {
if (IsTileOwner(tile, v->owner)) { if (!IsTileOwner(tile, v->owner)) {
// different station owner
bitmask = 0;
} else {
/* Our station */ /* Our station */
RoadStopType rstype = (v->cargo_type == CT_PASSENGERS) ? RS_BUS : RS_TRUCK; RoadStopType rstype = (v->cargo_type == CT_PASSENGERS) ? RS_BUS : RS_TRUCK;
if (GetRoadStopType(tile) == rstype) { if (GetRoadStopType(tile) != rstype) {
// wrong station type
bitmask = 0;
} else {
// proper station type, check if there is free loading bay
const RoadStop *rs = GetRoadStopByTile(tile, rstype); const RoadStop *rs = GetRoadStopByTile(tile, rstype);
if (rs == NULL || (!_patches.roadveh_queue && GB(rs->status, 0, 2) == 0)) {
if (rs != NULL && (_patches.roadveh_queue || GB(rs->status, 0, 2) != 0)) { // station is full and RV queuing is off
bitmask |= _road_veh_fp_ax_or[GetRoadStopDir(tile)]; bitmask = 0;
} }
} }
} }