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

Merge: Codechange: Use null pointer literal instead of the NULL macro

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-04-11 18:14:13 +01:00
parent f5747bf753 7c8e7c6b6e
commit 674732cd68
585 changed files with 6604 additions and 6604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/table/settings.ini
View File

@@ -102,15 +102,15 @@ 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
extver = SlXvFeatureTest()
patxname = NULL
patxname = nullptr
xref = <this parameter must be set>
orderproc = NULL
orderproc = nullptr
@@ -1205,14 +1205,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
@@ -1222,7 +1222,7 @@ max = 800
to = SLV_120
[SDTG_VAR]
name = NULL
name = nullptr
type = SLE_UINT16
guiflags = SGF_0ISDISABLED
var = _old_vds.servint_roadveh
@@ -1232,7 +1232,7 @@ max = 800
to = SLV_120
[SDTG_VAR]
name = NULL
name = nullptr
type = SLE_UINT16
guiflags = SGF_0ISDISABLED
var = _old_vds.servint_ships
@@ -1242,7 +1242,7 @@ max = 800
to = SLV_120
[SDTG_VAR]
name = NULL
name = nullptr
type = SLE_UINT16
guiflags = SGF_0ISDISABLED
var = _old_vds.servint_aircraft
@@ -3189,7 +3189,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
@@ -3199,7 +3199,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
@@ -3209,7 +3209,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
@@ -4501,14 +4501,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]
@@ -4888,7 +4888,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
@@ -4897,7 +4897,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
@@ -4906,7 +4906,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
@@ -4915,35 +4915,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