From 6774e5b086d8a72c14612ed1087cb29d2985648d Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 16 May 2026 08:35:13 +0300 Subject: [PATCH 41/41] multipliers.c: Replace NULL with nullptr See RM #2028 Signed-off-by: Marko Lindqvist --- common/multipliers.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/common/multipliers.c b/common/multipliers.c index 14b250134d..701c84b26b 100644 --- a/common/multipliers.c +++ b/common/multipliers.c @@ -33,7 +33,7 @@ void multipliers_init(void) name_init(&multipliers[i].name); requirement_vector_init(&multipliers[i].reqs); multipliers[i].ruledit_disabled = FALSE; - multipliers[i].helptext = NULL; + multipliers[i].helptext = nullptr; } } @@ -46,7 +46,7 @@ void multipliers_free(void) requirement_vector_free(&(pmul->reqs)); if (pmul->helptext) { strvec_destroy(pmul->helptext); - pmul->helptext = NULL; + pmul->helptext = nullptr; } } multipliers_iterate_end; } @@ -56,7 +56,7 @@ void multipliers_free(void) ****************************************************************************/ struct multiplier *multiplier_by_number(Multiplier_type_id id) { - fc_assert_ret_val(id >= 0 && id < game.control.num_multipliers, NULL); + fc_assert_ret_val(id >= 0 && id < game.control.num_multipliers, nullptr); return &multipliers[id]; } @@ -66,7 +66,7 @@ struct multiplier *multiplier_by_number(Multiplier_type_id id) ****************************************************************************/ Multiplier_type_id multiplier_number(const struct multiplier *pmul) { - fc_assert_ret_val(NULL != pmul, -1); + fc_assert_ret_val(pmul != nullptr, -1); return pmul - multipliers; } @@ -109,15 +109,15 @@ const char *multiplier_rule_name(const struct multiplier *pmul) } /************************************************************************//** - Returns multiplier matching rule name, or NULL if there is no multiplier + Returns multiplier matching rule name, or nullptr if there is no multiplier with such a name. ****************************************************************************/ struct multiplier *multiplier_by_rule_name(const char *name) { const char *qs; - if (name == NULL) { - return NULL; + if (name == nullptr) { + return nullptr; } qs = Qn_(name); @@ -128,7 +128,7 @@ struct multiplier *multiplier_by_rule_name(const char *name) } } multipliers_iterate_end; - return NULL; + return nullptr; } /************************************************************************//** @@ -146,5 +146,5 @@ bool multiplier_can_be_changed(struct multiplier *pmul, struct player *pplayer) } return are_reqs_active(&(const struct req_context) { .player = pplayer }, - NULL, &pmul->reqs, RPT_CERTAIN); + nullptr, &pmul->reqs, RPT_CERTAIN); } -- 2.53.0