Mercurial > hg > openttd
changeset 17455:5f4a2ff8dec6 draft
(svn r22209) -Codechange: Move function declarations from settings.h.preamble to the ini file that uses it.
author | alberth <alberth@openttd.org> |
---|---|
date | Sun, 06 Mar 2011 10:35:40 +0000 |
parents | 462b0ebbbcfd |
children | 6dce16791f02 |
files | src/table/company_settings.ini src/table/settings.h.preamble src/table/settings.ini |
diffstat | 3 files changed, 44 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/src/table/company_settings.ini +++ b/src/table/company_settings.ini @@ -7,6 +7,9 @@ ; [pre-amble] +static bool CheckInterval(int32 p1); +static bool InvalidateDetailsWindow(int32 p1); + static const SettingDesc _company_settings[] = { [post-amble] };
--- a/src/table/settings.h.preamble +++ b/src/table/settings.h.preamble @@ -9,48 +9,8 @@ /** @file table/settings.h Settings to save in the savegame and config file. */ -/* Begin - Callback Functions for the various settings */ -static bool v_PositionMainToolbar(int32 p1); -static bool v_PositionStatusbar(int32 p1); -static bool PopulationInLabelActive(int32 p1); -static bool RedrawScreen(int32 p1); -static bool RedrawSmallmap(int32 p1); -static bool InvalidateDetailsWindow(int32 p1); -static bool InvalidateStationBuildWindow(int32 p1); -static bool InvalidateBuildIndustryWindow(int32 p1); -static bool CloseSignalGUI(int32 p1); -static bool InvalidateTownViewWindow(int32 p1); -static bool DeleteSelectStationWindow(int32 p1); -static bool UpdateConsists(int32 p1); -static bool CheckInterval(int32 p1); -static bool TrainAccelerationModelChanged(int32 p1); -static bool RoadVehAccelerationModelChanged(int32 p1); -static bool TrainSlopeSteepnessChanged(int32 p1); -static bool RoadVehSlopeSteepnessChanged(int32 p1); -static bool DragSignalsDensityChanged(int32); -static bool TownFoundingChanged(int32 p1); -static bool DifficultyReset(int32 level); -static bool DifficultyChange(int32); -static bool DifficultyNoiseChange(int32 i); -static bool MaxNoAIsChange(int32 i); -static bool CheckRoadSide(int p1); +/* Callback function used in _settings[] as well as _company_settings[] */ static int32 ConvertLandscape(const char *value); -static bool CheckFreeformEdges(int32 p1); -static bool ChangeDynamicEngines(int32 p1); -static bool StationCatchmentChanged(int32 p1); -static bool InvalidateVehTimetableWindow(int32 p1); -static bool InvalidateCompanyLiveryWindow(int32 p1); -static bool InvalidateNewGRFChangeWindows(int32 p1); -static bool InvalidateIndustryViewWindow(int32 p1); -static bool RedrawTownAuthority(int32 p1); - -#ifdef ENABLE_NETWORK -static bool UpdateClientName(int32 p1); -static bool UpdateServerPassword(int32 p1); -static bool UpdateRconPassword(int32 p1); -static bool UpdateClientConfigValues(int32 p1); -#endif /* ENABLE_NETWORK */ -/* End - Callback Functions for the various settings */ /****************************
--- a/src/table/settings.ini +++ b/src/table/settings.ini @@ -7,6 +7,46 @@ ; [pre-amble] +/* Begin - Callback Functions for the various settings */ +static bool v_PositionMainToolbar(int32 p1); +static bool v_PositionStatusbar(int32 p1); +static bool PopulationInLabelActive(int32 p1); +static bool RedrawScreen(int32 p1); +static bool RedrawSmallmap(int32 p1); +static bool InvalidateStationBuildWindow(int32 p1); +static bool InvalidateBuildIndustryWindow(int32 p1); +static bool CloseSignalGUI(int32 p1); +static bool InvalidateTownViewWindow(int32 p1); +static bool DeleteSelectStationWindow(int32 p1); +static bool UpdateConsists(int32 p1); +static bool TrainAccelerationModelChanged(int32 p1); +static bool RoadVehAccelerationModelChanged(int32 p1); +static bool TrainSlopeSteepnessChanged(int32 p1); +static bool RoadVehSlopeSteepnessChanged(int32 p1); +static bool DragSignalsDensityChanged(int32); +static bool TownFoundingChanged(int32 p1); +static bool DifficultyReset(int32 level); +static bool DifficultyChange(int32); +static bool DifficultyNoiseChange(int32 i); +static bool MaxNoAIsChange(int32 i); +static bool CheckRoadSide(int p1); +static bool CheckFreeformEdges(int32 p1); +static bool ChangeDynamicEngines(int32 p1); +static bool StationCatchmentChanged(int32 p1); +static bool InvalidateVehTimetableWindow(int32 p1); +static bool InvalidateCompanyLiveryWindow(int32 p1); +static bool InvalidateNewGRFChangeWindows(int32 p1); +static bool InvalidateIndustryViewWindow(int32 p1); +static bool RedrawTownAuthority(int32 p1); + +#ifdef ENABLE_NETWORK +static bool UpdateClientName(int32 p1); +static bool UpdateServerPassword(int32 p1); +static bool UpdateRconPassword(int32 p1); +static bool UpdateClientConfigValues(int32 p1); +#endif /* ENABLE_NETWORK */ +/* End - Callback Functions for the various settings */ + /* Some settings do not need to be synchronised when playing in multiplayer. * These include for example the GUI settings and will not be saved with the * savegame.