dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r306) -Fix: [985439] un-owned rail. Trains could cross competitor's tracks if there was a road-crossing over it.

Browse Source
This commit is contained in:
darkvater
2004-09-21 21:28:42 +00:00
parent 93d9afca4b
commit 475ef74ab7
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
train_cmd.c
View File

@@ -1819,9 +1819,8 @@ static int GetDirectionToVehicle(Vehicle *v, int x, int y)
/* Check if the vehicle is compatible with the specified tile */ /* Check if the vehicle is compatible with the specified tile */
static bool CheckCompatibleRail(Vehicle *v, uint tile) static bool CheckCompatibleRail(Vehicle *v, uint tile)
{ {
if (IS_TILETYPE(tile, MP_RAILWAY) || if (IS_TILETYPE(tile, MP_RAILWAY) || IS_TILETYPE(tile, MP_STATION)) {
IS_TILETYPE(tile, MP_STATION)) { // normal tracks, jump to owner check
} else if (IS_TILETYPE(tile, MP_TUNNELBRIDGE)) { } else if (IS_TILETYPE(tile, MP_TUNNELBRIDGE)) {
if ((_map5[tile] & 0xC0) == 0xC0) {// is bridge middle part? if ((_map5[tile] & 0xC0) == 0xC0) {// is bridge middle part?
TileInfo ti; TileInfo ti;
@@ -1834,6 +1833,12 @@ static bool CheckCompatibleRail(Vehicle *v, uint tile)
if(v->z_pos != ti.z) // train is going over bridge if(v->z_pos != ti.z) // train is going over bridge
return true; return true;
} }
} else if (IS_TILETYPE(tile, MP_STREET)) { // train is going over a road-crossing
// tracks over roads, do owner check of tracks (_map_owner[tile])
if (_map_owner[tile] != v->owner || (v->subtype == 0 && (_map3_hi[tile] & 0xF) != v->u.rail.railtype))
return false;
return true;
} else } else
return true; return true;