summaryrefslogtreecommitdiff
path: root/src/settings_table.h
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2021-07-09 21:16:03 +0200
committerGitHub <noreply@github.com>2021-07-09 21:16:03 +0200
commit8f5d0ecde39cbaf2ac1a6d27e82239bfc3bf1515 (patch)
tree232daba5b6f77f8ae33191c0b88dd21ef662a1c1 /src/settings_table.h
parentd9ca9ca55571829af88429147e20bf0734e07e2d (diff)
downloadopenttd-8f5d0ecde39cbaf2ac1a6d27e82239bfc3bf1515.tar.xz
Codechange: split settings.ini over several files (#9421)
This reduced the load on compilers, as currently for example MacOS doesn't like the huge settings-tables. Additionally, nobody can find settings, as the list is massive and unordered. By splitting it, it becomes a little bit more sensible.
Diffstat (limited to 'src/settings_table.h')
-rw-r--r--src/settings_table.h23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/settings_table.h b/src/settings_table.h
index ace0ec7a2..d662b6a57 100644
--- a/src/settings_table.h
+++ b/src/settings_table.h
@@ -15,18 +15,25 @@
#include <array>
#include "settings_internal.h"
-typedef span<const SettingVariant> SettingTable;
-
-extern SettingTable _settings;
-extern SettingTable _network_settings;
-extern SettingTable _network_private_settings;
-extern SettingTable _network_secrets_settings;
-
extern SettingTable _company_settings;
extern SettingTable _currency_settings;
-extern SettingTable _gameopt_settings;
+extern SettingTable _difficulty_settings;
+extern SettingTable _economy_settings;
+extern SettingTable _game_settings;
+extern SettingTable _gui_settings;
+extern SettingTable _linkgraph_settings;
+extern SettingTable _locale_settings;
extern SettingTable _misc_settings;
+extern SettingTable _multimedia_settings;
+extern SettingTable _network_private_settings;
+extern SettingTable _network_secrets_settings;
+extern SettingTable _network_settings;
+extern SettingTable _news_display_settings;
+extern SettingTable _old_gameopt_settings;
+extern SettingTable _pathfinding_settings;
+extern SettingTable _script_settings;
extern SettingTable _window_settings;
+extern SettingTable _world_settings;
#if defined(_WIN32) && !defined(DEDICATED)
extern SettingTable _win32_settings;
#endif /* _WIN32 */