From 42a8e3c5a9da3f07dea13e37639dc9d0fe9756ff Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 20 May 2026 06:35:01 +0300 Subject: [PATCH 40/40] diptreaty.c: Replace NULL with nullptr See RM #2033 Signed-off-by: Marko Lindqvist --- common/diptreaty.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/diptreaty.c b/common/diptreaty.c index d9b0de1d32..6622601158 100644 --- a/common/diptreaty.c +++ b/common/diptreaty.c @@ -28,7 +28,7 @@ static struct clause_info clause_infos[CLAUSE_COUNT]; -static struct treaty_list *treaties = NULL; +static struct treaty_list *treaties = nullptr; /**********************************************************************//** Returns TRUE iff pplayer could do diplomacy in the game at all. @@ -189,14 +189,14 @@ bool add_clause(struct treaty *ptreaty, struct player *pfrom, /* Leave it to the server to decide if the other party can meet * the requirements. */ - if (client_player == NULL || client_player == pfrom) { + if (client_player == nullptr || client_player == pfrom) { if (!are_reqs_active(&(const struct req_context) { .player = pfrom }, &(const struct req_context) { .player = pto }, &clause_infos[type].giver_reqs, RPT_POSSIBLE)) { return FALSE; } } - if (client_player == NULL || client_player == pto) { + if (client_player == nullptr || client_player == pto) { if (!are_reqs_active(&(const struct req_context) { .player = pto }, &(const struct req_context) { .player = pfrom }, &clause_infos[type].receiver_reqs, @@ -204,7 +204,7 @@ bool add_clause(struct treaty *ptreaty, struct player *pfrom, return FALSE; } } - if (client_player == NULL) { + if (client_player == nullptr) { if (!are_reqs_active(&(const struct req_context) { .player = pfrom }, &(const struct req_context) { .player = pto }, &clause_infos[type].either_reqs, @@ -339,7 +339,7 @@ void treaties_free(void) free_treaties(); treaty_list_destroy(treaties); - treaties = NULL; + treaties = nullptr; } /**********************************************************************//** @@ -368,7 +368,7 @@ struct treaty *find_treaty(struct player *plr0, struct player *plr1) } } treaty_list_iterate_end; - return NULL; + return nullptr; } /**********************************************************************//** -- 2.53.0