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/lang/german.txt
#	src/lang/korean.txt
#	src/lang/traditional_chinese.txt
#	src/window.cpp
This commit is contained in:
Jonathan G Rennison
2017-04-01 01:14:28 +01:00
parent 83091f55da 86d1a00ba6
commit 8317eac918
81 changed files with 473 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/settings_gui.cpp
View File

@@ -36,8 +36,6 @@
#include "textfile_gui.h"
#include "stringfilter_type.h"
#include "querystring_gui.h"
#include "signs_func.h"
#include "station_func.h"
#include <vector>
@@ -536,9 +534,7 @@ struct GameOptionsWindow : Window {
UpdateCursorSize();
UpdateFontHeightCache();
LoadStringWidthTable();
UpdateAllSignVirtCoords();
UpdateAllTownVirtCoords();
UpdateAllStationVirtCoords();
UpdateAllVirtCoords();
break;
case WID_GO_BASE_GRF_DROPDOWN:
@@ -1511,6 +1507,7 @@ static SettingsContainer &GetSettingsTree()
general->Add(new SettingEntry("gui.errmsg_duration"));
general->Add(new SettingEntry("gui.window_snap_radius"));
general->Add(new SettingEntry("gui.window_soft_limit"));
general->Add(new SettingEntry("gui.right_mouse_wnd_close"));
}
SettingsPage *viewports = interface->Add(new SettingsPage(STR_CONFIG_SETTING_INTERFACE_VIEWPORTS));