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

(svn r8184) if cascade -> switch

release/0.6
tron 2007-01-17 06:54:03 +00:00
parent 2742b5fe25
commit a973e45719
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/openttd.cpp
View File

@ -1517,7 +1517,8 @@ bool AfterLoadGame(void)
* room for PBS. Now in version 21 move it back :P. */ * room for PBS. Now in version 21 move it back :P. */
if (CheckSavegameVersion(21) && !CheckSavegameVersion(15)) { if (CheckSavegameVersion(21) && !CheckSavegameVersion(15)) {
for (TileIndex t = 0; t < map_size; t++) { for (TileIndex t = 0; t < map_size; t++) {
if (IsTileType(t, MP_RAILWAY)) { switch (GetTileType(t)) {
case MP_RAILWAY:
if (HasSignals(t)) { if (HasSignals(t)) {
// convert PBS signals to combo-signals // convert PBS signals to combo-signals
if (HASBIT(_m[t].m4, 2)) SetSignalType(t, SIGTYPE_COMBO); if (HASBIT(_m[t].m4, 2)) SetSignalType(t, SIGTYPE_COMBO);
@ -1533,13 +1534,20 @@ bool AfterLoadGame(void)
} else { } else {
CLRBIT(_m[t].m3, 6); CLRBIT(_m[t].m3, 6);
} }
} break;
case MP_STREET:
// Clear PBS reservation on crossing // Clear PBS reservation on crossing
if (IsTileType(t, MP_STREET) && IsLevelCrossing(t)) CLRBIT(_m[t].m5, 0); if (IsLevelCrossing(t)) CLRBIT(_m[t].m5, 0);
break;
case MP_STATION:
// Clear PBS reservation on station // Clear PBS reservation on station
if (IsTileType(t, MP_STATION)) CLRBIT(_m[t].m3, 6); CLRBIT(_m[t].m3, 6);
break;
default: break;
}
} }
} }