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

Progsig: Fix various issues with removing program dependencies.

Browse Source 
Fix RemoveProgramDependencies using one parameter for both source
and target, and rename the parameters to something sensible.
Update program window when invalidating in RemoveProgramDependencies.
Make SignalStateCondition::IsSignalValid const and add CheckSignalValid
for non-const validaty checking.
This commit is contained in:
Jonathan G Rennison
2015-10-03 14:15:58 +01:00
parent 1823deae7d
commit b2b9c0a070
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/signal.cpp
View File

@@ -768,11 +768,11 @@ 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);
SignalType t = GetSignalType(dependant.tile, dependant.track);
if (IsProgrammableSignal(t)) {
RemoveProgramDependencies(by, on);
RemoveProgramDependencies(being_removed, dependant);
} else {
DEBUG(misc, 0, "Removing dependency held by non-programmable signal (Unexpected)");
}