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

5
src/programmable_signals.h
View File

@@ -202,7 +202,8 @@ class SignalStateCondition: public SignalCondition {
SignalStateCondition(SignalReference this_sig, TileIndex sig_tile, Trackdir sig_track);
void SetSignal(TileIndex tile, Trackdir track);
bool IsSignalValid();
bool IsSignalValid() const;
bool CheckSignalValid();
void Invalidate();
virtual bool Evaluate(SignalVM& vm);
@@ -389,7 +390,7 @@ void FreeSignalPrograms();
SignalState RunSignalProgram(SignalReference ref, uint num_exits, uint num_green);
/// Remove dependencies on signal @p on from @p by
void RemoveProgramDependencies(SignalReference by, SignalReference on);
void RemoveProgramDependencies(SignalReference dependency_target, SignalReference signal_to_update);
///@}
#endif