Merge branch 'master' into jgrpp

# Conflicts:
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_base.h
#	src/debug.cpp
#	src/debug.h
#	src/economy.cpp
#	src/engine_type.h
#	src/graph_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_cmd.h
#	src/network/core/os_abstraction.cpp
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings_type.h
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/tests/bitmath_func.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp

src/table/settings/difficulty_settings.ini

@@ -135,7 +135,7 @@ from     = SLV_97
 flags    = SF_NEWGAME_ONLY | SF_SCENEDIT_TOO | SF_GUI_CURRENCY | SF_GUI_0_IS_SPECIAL
 def      = 300000
 min      = LOAN_INTERVAL
-max      = 2000000000
+max      = MAX_LOAN_LIMIT
 pre_cb   = [](auto &new_value) { new_value = (new_value + LOAN_INTERVAL / 2) / LOAN_INTERVAL * LOAN_INTERVAL; return true; }
 interval = LOAN_INTERVAL
 str      = STR_CONFIG_SETTING_MAXIMUM_INITIAL_LOAN
@@ -371,3 +371,11 @@ min      = 0
 max      = 3
 cat      = SC_BASIC
 
+[SDT_BOOL]
+var      = difficulty.infinite_money
+def      = false
+str      = STR_CONFIG_SETTING_INFINITE_MONEY
+strhelp  = STR_CONFIG_SETTING_INFINITE_MONEY_HELPTEXT
+cat      = SC_BASIC
+post_cb  = [](auto) { SetWindowDirty(WC_STATUS_BAR, 0); }
+

src/table/settings/world_settings.ini

@@ -238,6 +238,7 @@ strval   = STR_VARIETY_NONE
 var      = game_creation.generation_seed
 type     = SLE_UINT32
 from     = SLV_30
+flags    = SF_NOT_IN_CONFIG
 def      = GENERATE_NEW_SEED
 min      = 0
 max      = UINT32_MAX