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

Settings: Merge orderproc into guiproc

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-09-29 20:10:38 +01:00
parent db11c1d927
commit 65c20edde7
11 changed files with 71 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/settings.cpp
View File

@@ -1855,21 +1855,6 @@ static bool UpdateClientConfigValues(int32 p1)
/* End - Callback Functions */
/* Begin - GUI order callbacks */
static int OrderTownGrowthRate(uint nth)
{
if (nth == 0) {
return 0;
} else if (nth <= 2) {
return nth - 3;
} else {
return nth - 2;
}
}
/* End - GUI order callbacks */
/* Begin - xref conversion callbacks */
static int64 LinkGraphDistModeXrefChillPP(int64 val)
@@ -1881,6 +1866,28 @@ static int64 LinkGraphDistModeXrefChillPP(int64 val)
/* Begin - GUI callbacks */
static bool OrderTownGrowthRate(SettingOnGuiCtrlData &data)
{
switch (data.type) {
case SOGCT_MULTISTRING_ORDER: {
int in = data.val;
int out;
if (in == 0) {
out = 0;
} else if (in <= 2) {
out = in - 3;
} else {
out = in - 2;
}
data.val = out;
return true;
}
default:
return false;
}
}
static bool LinkGraphDistributionSettingGUI(SettingOnGuiCtrlData &data)
{
switch (data.type) {