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

Merge branch 'progsig-sx' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2015-10-03 14:34:01 +01:00
parent 587ffc2cfa 8760187899
commit 6c5b86bd21
6 changed files with 95 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/signal.cpp
View File

@@ -802,12 +802,14 @@ void CheckRemoveSignalsFromTile(TileIndex tile)
}
}
static void NotifyRemovingDependentSignal(SignalReference on, SignalReference by)
static void NotifyRemovingDependentSignal(SignalReference being_removed, SignalReference dependant)
{
SignalType t = GetSignalType(by.tile, by.track);
if (IsProgrammableSignal(t)) {
RemoveProgramDependencies(by, on);
} else DEBUG(misc, 0, "Removing dependency held by non-programmable signal (Unexpected)");
SignalType t = GetSignalType(dependant.tile, dependant.track);
if (IsProgrammableSignal(t)) {
RemoveProgramDependencies(being_removed, dependant);
} else {
DEBUG(misc, 0, "Removing dependency held by non-programmable signal (Unexpected)");
}
}
void CheckRemoveSignal(TileIndex tile, Track track)