Merge branch 'signal_tunnels_bridges' into jgrpp

# Conflicts:
#	src/table/settings.ini
#	src/tunnelbridge.h
This commit is contained in:
Jonathan G Rennison
2017-01-30 21:41:20 +00:00
6 changed files with 59 additions and 3 deletions

View File

@@ -1159,6 +1159,14 @@ static bool InvalidateCompanyWindow(int32 p1)
return true;
}
static bool SimulatedWormholeSignalsChanged(int32 p1)
{
extern void AfterLoadCompanyStats();
AfterLoadCompanyStats();
MarkWholeScreenDirty();
return true;
}
/** Checks if any settings are set to incorrect values, and sets them to correct values in that case. */
static void ValidateSettings()
{