Codechange: NULL -> nullptr in settings files.

8 files changed, 70 insertions, 70 deletions

diff --git a/src/table/company_settings.ini b/src/table/company_settings.ini
index a6e873f65..3ff5d6429 100644
--- a/src/table/company_settings.ini
+++ b/src/table/company_settings.ini
@@ -29,8 +29,8 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
diff --git a/src/table/currency_settings.ini b/src/table/currency_settings.ini
index bcce65801..02777d2ae 100644
--- a/src/table/currency_settings.ini
+++ b/src/table/currency_settings.ini
@@ -23,8 +23,8 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
@@ -57,7 +57,7 @@ max      = MAX_YEAR
 base     = CurrencySpec
 var      = prefix
 type     = SLE_STRBQ
-def      = NULL
+def      = nullptr
 
 [SDT_STR]
 base     = CurrencySpec
diff --git a/src/table/gameopt_settings.ini b/src/table/gameopt_settings.ini
index 29d6a3177..247bfbed2 100644
--- a/src/table/gameopt_settings.ini
+++ b/src/table/gameopt_settings.ini
@@ -55,8 +55,8 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
@@ -74,7 +74,7 @@ length   = 17
 def      = 0
 min      = 0
 max      = 0
-full     = NULL
+full     = nullptr
 to       = SLV_4
 
 [SDTG_GENERAL]
@@ -88,7 +88,7 @@ length   = 18
 def      = 0
 min      = 0
 max      = 0
-full     = NULL
+full     = nullptr
 from     = SLV_4
 
 ##
diff --git a/src/table/misc_settings.ini b/src/table/misc_settings.ini
index 787a82dd8..6d974a005 100644
--- a/src/table/misc_settings.ini
+++ b/src/table/misc_settings.ini
@@ -30,8 +30,8 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
@@ -64,55 +64,55 @@ cat      = SC_BASIC
 name     = ""graphicsset""
 type     = SLE_STRQ
 var      = BaseGraphics::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""soundsset""
 type     = SLE_STRQ
 var      = BaseSounds::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""musicset""
 type     = SLE_STRQ
 var      = BaseMusic::ini_set
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTG_STR]
 name     = ""videodriver""
 type     = SLE_STRQ
 var      = _ini_videodriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""musicdriver""
 type     = SLE_STRQ
 var      = _ini_musicdriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""sounddriver""
 type     = SLE_STRQ
 var      = _ini_sounddriver
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""blitter""
 type     = SLE_STRQ
 var      = _ini_blitter
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 name     = ""language""
 type     = SLE_STRB
 var      = _config_language_file
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 ; workaround for implicit lengthof() in SDTG_LIST
@@ -128,14 +128,14 @@ cat      = SC_BASIC
 name     = ""screenshot_format""
 type     = SLE_STRB
 var      = _screenshot_format_name
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""savegame_format""
 type     = SLE_STRB
 var      = _savegame_format
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_BOOL]
@@ -148,28 +148,28 @@ ifdef    = WITH_FREETYPE
 name     = ""small_font""
 type     = SLE_STRB
 var      = _freetype.small.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 ifdef    = WITH_FREETYPE
 name     = ""medium_font""
 type     = SLE_STRB
 var      = _freetype.medium.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 ifdef    = WITH_FREETYPE
 name     = ""large_font""
 type     = SLE_STRB
 var      = _freetype.large.font
-def      = NULL
+def      = nullptr
 
 [SDTG_STR]
 ifdef    = WITH_FREETYPE
 name     = ""mono_font""
 type     = SLE_STRB
 var      = _freetype.mono.font
-def      = NULL
+def      = nullptr
 
 [SDTG_VAR]
 ifdef    = WITH_FREETYPE
@@ -280,14 +280,14 @@ cat      = SC_BASIC
 name     = ""keyboard""
 type     = SLE_STRB
 var      = _keyboard_opt[0]
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_STR]
 name     = ""keyboard_caps""
 type     = SLE_STRB
 var      = _keyboard_opt[1]
-def      = NULL
+def      = nullptr
 cat      = SC_EXPERT
 
 [SDTG_VAR]
diff --git a/src/table/settings.h.preamble b/src/table/settings.h.preamble
index f475e305b..b6992764d 100644
--- a/src/table/settings.h.preamble
+++ b/src/table/settings.h.preamble
@@ -62,19 +62,19 @@ static size_t ConvertLandscape(const char *value);
 /* Macros for various objects to go in the configuration file.
  * This section is for global variables */
 #define SDTG_GENERAL(name, sdt_cmd, sle_cmd, type, flags, guiflags, var, length, def, min, max, interval, full, str, strhelp, strval, proc, from, to, cat)\
-	{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, NULL, cat), SLEG_GENERAL(sle_cmd, var, type | flags, length, from, to)}
+	{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, nullptr, cat), SLEG_GENERAL(sle_cmd, var, type | flags, length, from, to)}
 
 #define SDTG_VAR(name, type, flags, guiflags, var, def, min, max, interval, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(name, SDT_NUMX, SL_VAR, type, flags, guiflags, var, 0, def, min, max, interval, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(name, SDT_NUMX, SL_VAR, type, flags, guiflags, var, 0, def, min, max, interval, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTG_BOOL(name, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(name, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, var, 0, def, 0, 1, 0, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(name, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, var, 0, def, 0, 1, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTG_LIST(name, type, length, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(name, SDT_INTLIST, SL_ARR, type, flags, guiflags, var, length, def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(name, SDT_INTLIST, SL_ARR, type, flags, guiflags, var, length, def, 0, 0, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTG_STR(name, type, flags, guiflags, var, def, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(name, SDT_STRING, SL_STR, type, flags, guiflags, var, sizeof(var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(name, SDT_STRING, SL_STR, type, flags, guiflags, var, sizeof(var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTG_OMANY(name, type, flags, guiflags, var, def, max, full, str, strhelp, strval, proc, from, to, cat)\
 	SDTG_GENERAL(name, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat)
@@ -83,9 +83,9 @@ static size_t ConvertLandscape(const char *value);
 	SDTG_GENERAL(name, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, var, 0, def, 0, 0, 0, full, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTG_NULL(length, from, to)\
-	{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_NULL(length, from, to)}
+	{{"", nullptr, {0}, {0}, 0, 0, 0, nullptr, STR_NULL, STR_NULL, STR_NULL, nullptr, nullptr, SC_NONE}, SLEG_NULL(length, from, to)}
 
-#define SDTG_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLEG_END()}
+#define SDTG_END() {{nullptr, nullptr, {0}, {0}, 0, 0, 0, nullptr, STR_NULL, STR_NULL, STR_NULL, nullptr, nullptr, SC_NONE}, SLEG_END()}
 
 /* Macros for various objects to go in the configuration file.
  * This section is for structures where their various members are saved */
@@ -93,44 +93,44 @@ static size_t ConvertLandscape(const char *value);
 	{NSD_GENERAL(name, def, sdt_cmd, guiflags, min, max, interval, full, str, strhelp, strval, proc, load, cat), SLE_GENERAL(sle_cmd, base, var, type | flags, length, from, to)}
 
 #define SDT_VAR(base, var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to, cat)\
-	SDT_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, base, var, 1, def, min, max, interval, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
+	SDT_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, base, var, 1, def, min, max, interval, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat)
 
 #define SDT_BOOL(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
-	SDT_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, base, var, 1, def, 0, 1, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
+	SDT_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, base, var, 1, def, 0, 1, 0, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat)
 
 #define SDT_LIST(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
-	SDT_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
+	SDT_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, base, var, lengthof(((base*)8)->var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat)
 
 #define SDT_STR(base, var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
-	SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, sizeof(((base*)8)->var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
+	SDT_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, base, var, sizeof(((base*)8)->var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat)
 
 #define SDT_CHR(base, var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
-	SDT_GENERAL(#var, SDT_STRING, SL_VAR, SLE_CHAR, flags, guiflags, base, var, 1, def, 0, 0, 0, NULL, str, strhelp, strval, proc, NULL, from, to, cat)
+	SDT_GENERAL(#var, SDT_STRING, SL_VAR, SLE_CHAR, flags, guiflags, base, var, 1, def, 0, 0, 0, nullptr, str, strhelp, strval, proc, nullptr, from, to, cat)
 
 #define SDT_OMANY(base, var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, load, cat)\
 	SDT_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, load, from, to, cat)
 
 #define SDT_MMANY(base, var, type, flags, guiflags, def, full, str, proc, strhelp, strval, from, to, cat)\
-	SDT_GENERAL(#var, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, 0, 0, full, str, strhelp, strval, proc, NULL, from, to, cat)
+	SDT_GENERAL(#var, SDT_MANYOFMANY, SL_VAR, type, flags, guiflags, base, var, 1, def, 0, 0, 0, full, str, strhelp, strval, proc, nullptr, from, to, cat)
 
 #define SDT_NULL(length, from, to)\
-	{{"", NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_CONDNULL(length, from, to)}
+	{{"", nullptr, {0}, {0}, 0, 0, 0, nullptr, STR_NULL, STR_NULL, STR_NULL, nullptr, nullptr, SC_NONE}, SLE_CONDNULL(length, from, to)}
 
 
 #define SDTC_VAR(var, type, flags, guiflags, def, min, max, interval, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, min, max, interval, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(#var, SDT_NUMX, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, min, max, interval, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTC_BOOL(var, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, _settings_client.var, 1, def, 0, 1, 0, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(#var, SDT_BOOLX, SL_VAR, SLE_BOOL, flags, guiflags, _settings_client.var, 1, def, 0, 1, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTC_LIST(var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(#var, SDT_INTLIST, SL_ARR, type, flags, guiflags, _settings_client.var, lengthof(_settings_client.var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTC_STR(var, type, flags, guiflags, def, str, strhelp, strval, proc, from, to, cat)\
-	SDTG_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, _settings_client.var, sizeof(_settings_client.var), def, 0, 0, 0, NULL, str, strhelp, strval, proc, from, to, cat)
+	SDTG_GENERAL(#var, SDT_STRING, SL_STR, type, flags, guiflags, _settings_client.var, sizeof(_settings_client.var), def, 0, 0, 0, nullptr, str, strhelp, strval, proc, from, to, cat)
 
 #define SDTC_OMANY(var, type, flags, guiflags, def, max, full, str, strhelp, strval, proc, from, to, cat)\
 	SDTG_GENERAL(#var, SDT_ONEOFMANY, SL_VAR, type, flags, guiflags, _settings_client.var, 1, def, 0, max, 0, full, str, strhelp, strval, proc, from, to, cat)
 
-#define SDT_END() {{NULL, NULL, {0}, {0}, 0, 0, 0, NULL, STR_NULL, STR_NULL, STR_NULL, NULL, NULL, SC_NONE}, SLE_END()}
+#define SDT_END() {{nullptr, nullptr, {0}, {0}, 0, 0, 0, nullptr, STR_NULL, STR_NULL, STR_NULL, nullptr, nullptr, SC_NONE}, SLE_END()}
 
diff --git a/src/table/settings.ini b/src/table/settings.ini
index 78ed234ce..1aacb7634 100644
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -86,8 +86,8 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
@@ -1022,14 +1022,14 @@ proc     = MaxVehiclesChanged
 cat      = SC_BASIC
 
 [SDTG_BOOL]
-name     = NULL
+name     = nullptr
 guiflags = SGF_NO_NETWORK
 var      = _old_vds.servint_ispercent
 def      = false
 to       = SLV_120
 
 [SDTG_VAR]
-name     = NULL
+name     = nullptr
 type     = SLE_UINT16
 guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_trains
@@ -1039,7 +1039,7 @@ max      = 800
 to       = SLV_120
 
 [SDTG_VAR]
-name     = NULL
+name     = nullptr
 type     = SLE_UINT16
 guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_roadveh
@@ -1049,7 +1049,7 @@ max      = 800
 to       = SLV_120
 
 [SDTG_VAR]
-name     = NULL
+name     = nullptr
 type     = SLE_UINT16
 guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_ships
@@ -1059,7 +1059,7 @@ max      = 800
 to       = SLV_120
 
 [SDTG_VAR]
-name     = NULL
+name     = nullptr
 type     = SLE_UINT16
 guiflags = SGF_0ISDISABLED
 var      = _old_vds.servint_aircraft
@@ -2513,7 +2513,7 @@ var      = locale.digit_group_separator
 type     = SLE_STRQ
 from     = SLV_118
 flags    = SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 proc     = RedrawScreen
 cat      = SC_BASIC
 
@@ -2523,7 +2523,7 @@ var      = locale.digit_group_separator_currency
 type     = SLE_STRQ
 from     = SLV_118
 flags    = SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 proc     = RedrawScreen
 cat      = SC_BASIC
 
@@ -2533,7 +2533,7 @@ var      = locale.digit_decimal_separator
 type     = SLE_STRQ
 from     = SLV_126
 flags    = SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 proc     = RedrawScreen
 cat      = SC_BASIC
 
@@ -3361,14 +3361,14 @@ cat      = SC_BASIC
 var      = music.custom_1
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTC_LIST]
 var      = music.custom_2
 type     = SLE_UINT8
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTC_BOOL]
@@ -3748,7 +3748,7 @@ max      = 1
 var      = network.client_name
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 proc     = UpdateClientName
 cat      = SC_BASIC
 
@@ -3757,7 +3757,7 @@ var      = network.server_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
-def      = NULL
+def      = nullptr
 proc     = UpdateServerPassword
 cat      = SC_BASIC
 
@@ -3766,7 +3766,7 @@ var      = network.rcon_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
-def      = NULL
+def      = nullptr
 proc     = UpdateRconPassword
 cat      = SC_BASIC
 
@@ -3775,35 +3775,35 @@ var      = network.admin_password
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTC_STR]
 var      = network.default_company_pass
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 
 [SDTC_STR]
 var      = network.server_name
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
-def      = NULL
+def      = nullptr
 cat      = SC_BASIC
 
 [SDTC_STR]
 var      = network.connect_to_ip
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = NULL
+def      = nullptr
 
 [SDTC_STR]
 var      = network.network_id
 type     = SLE_STRB
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
 guiflags = SGF_NETWORK_ONLY
-def      = NULL
+def      = nullptr
 
 [SDTC_BOOL]
 var      = network.autoclean_companies
diff --git a/src/table/win32_settings.ini b/src/table/win32_settings.ini
index bb241f50c..7d9821475 100644
--- a/src/table/win32_settings.ini
+++ b/src/table/win32_settings.ini
@@ -28,8 +28,8 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED
diff --git a/src/table/window_settings.ini b/src/table/window_settings.ini
index 41223586a..67d1edb35 100644
--- a/src/table/window_settings.ini
+++ b/src/table/window_settings.ini
@@ -24,8 +24,8 @@ interval = 0
 str      = STR_NULL
 strhelp  = STR_CONFIG_SETTING_NO_EXPLANATION_AVAILABLE_HELPTEXT
 strval   = STR_NULL
-proc     = NULL
-load     = NULL
+proc     = nullptr
+load     = nullptr
 from     = SL_MIN_VERSION
 to       = SL_MAX_VERSION
 cat      = SC_ADVANCED