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

(svn r9971) -Fix (r9892, r9958): loading of post-'bridges over "everything"' messed with the railtype of bridges.

release/0.6
rubidium 2007-05-29 08:19:37 +00:00
parent 191845f736
commit 17b6ce80c7
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@ -1446,6 +1446,7 @@ bool AfterLoadGame()
if (CheckSavegameVersion(61)) { if (CheckSavegameVersion(61)) {
/* Added the RoadType */ /* Added the RoadType */
bool old_bridge = CheckSavegameVersion(42);
for (TileIndex t = 0; t < map_size; t++) { for (TileIndex t = 0; t < map_size; t++) {
switch(GetTileType(t)) { switch(GetTileType(t)) {
case MP_STREET: case MP_STREET:
@ -1470,7 +1471,9 @@ bool AfterLoadGame()
break; break;
case MP_TUNNELBRIDGE: case MP_TUNNELBRIDGE:
if ((IsTunnel(t) ? GetTunnelTransportType(t) : (TransportType)GB(_m[t].m5, 1, 2)) == TRANSPORT_ROAD) { /* Middle part of "old" bridges */
if (old_bridge && IsBridgeTile(t) && HASBIT(_m[t].m5, 6)) break;
if ((IsTunnel(t) ? GetTunnelTransportType(t) : (old_bridge ? (TransportType)GB(_m[t].m5, 1, 2) : GetBridgeTransportType(t))) == TRANSPORT_ROAD) {
SetRoadTypes(t, ROADTYPES_ROAD); SetRoadTypes(t, ROADTYPES_ROAD);
} }
break; break;