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

(svn r10006) -Fix (FS#362): allow different signal types on one tile

Browse Source
This commit is contained in:
glx
2007-05-31 21:21:04 +00:00
parent 4af692558a
commit 2958f0c53a
9 changed files with 110 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openttd.cpp
View File

@@ -1664,10 +1664,10 @@ bool AfterLoadGame()
case MP_RAILWAY:
if (HasSignals(t)) {
/* convert PBS signals to combo-signals */
if (HASBIT(_m[t].m2, 2)) SetSignalType(t, SIGTYPE_COMBO);
if (HASBIT(_m[t].m2, 2)) SetSignalType(t, TRACK_X, SIGTYPE_COMBO);
/* move the signal variant back */
SetSignalVariant(t, HASBIT(_m[t].m2, 3) ? SIG_SEMAPHORE : SIG_ELECTRIC);
SetSignalVariant(t, TRACK_X, HASBIT(_m[t].m2, 3) ? SIG_SEMAPHORE : SIG_ELECTRIC);
CLRBIT(_m[t].m2, 3);
}
@@ -2001,6 +2001,18 @@ bool AfterLoadGame()
_opt.diff.number_towns++;
}
if (CheckSavegameVersion(64)) {
/* copy the signal type/variant and move signal states bits */
for (TileIndex t = 0; t < map_size; t++) {
if (IsTileType(t, MP_RAILWAY) && HasSignals(t)) {
SetSignalStates(t, GB(_m[t].m2, 4, 4));
SetSignalVariant(t, INVALID_TRACK, GetSignalVariant(t, TRACK_X));
SetSignalType(t, INVALID_TRACK, GetSignalType(t, TRACK_X));
CLRBIT(_m[t].m2, 7);
}
}
}
/* Recalculate */
Group *g;
FOR_ALL_GROUPS(g) {