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

Merge branch 'save_ext' into jgrpp

Browse Source 
# Conflicts:
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
This commit is contained in:
Jonathan G Rennison
2017-08-20 10:38:23 +01:00
parent 2e7e712f06 a3d1585826
commit 0d2be99827
10 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/settings_gui.cpp
View File

@@ -2193,7 +2193,9 @@ struct GameSettingsWindow : Window {
DropDownList *list = new DropDownList();
for (int i = sdb->min; i <= (int)sdb->max; i++) {
*list->Append() = new DropDownListStringItem(sdb->str_val + i - sdb->min, i, false);
int val = sd->orderproc ? sd->orderproc(i - sdb->min) : i;
assert_msg(val >= sdb->min && val <= (int)sdb->max, "min: %d, max: %d, val: %d", sdb->min, sdb->max, val);
*list->Append() = new DropDownListStringItem(sdb->str_val + val - sdb->min, val, false);
}
ShowDropDownListAt(this, list, value, -1, wi_rect, COLOUR_ORANGE, true);