From 73e7f279f8d8709be1643f5a406bfbaa1c15345c Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 25 May 2025 09:28:41 +0300 Subject: [PATCH 81/81] citymap.c: Replace NULL with nullptr See RM #1445 Signed-off-by: Marko Lindqvist --- common/aicore/citymap.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/common/aicore/citymap.c b/common/aicore/citymap.c index 2d1badceab..2c5c6f57ad 100644 --- a/common/aicore/citymap.c +++ b/common/aicore/citymap.c @@ -50,7 +50,7 @@ * which has a negative value. */ -static int *citymap = NULL; +static int *citymap = nullptr; #define log_citymap log_debug @@ -78,10 +78,10 @@ void citymap_turn_init(struct player *pplayer) pcenter, ptile) { struct city *pwork = tile_worked(ptile); - if (NULL != pwork) { + if (pwork != nullptr) { citymap[tile_index(ptile)] = -(pwork->id); } else { - citymap[tile_index(ptile)]++; + citymap[tile_index(ptile)]++; } } city_tile_iterate_end; } city_list_iterate_end; @@ -109,7 +109,7 @@ void citymap_turn_init(struct player *pplayer) **************************************************************************/ void citymap_free(void) { - if (citymap != NULL) { + if (citymap != nullptr) { FC_FREE(citymap); } } @@ -189,8 +189,9 @@ int citymap_read(struct tile *ptile) **************************************************************************/ bool citymap_is_reserved(struct tile *ptile) { - if (NULL != tile_worked(ptile) /*|| tile_city(ptile)*/) { + if (tile_worked(ptile) != nullptr /*|| tile_city(ptile)*/ ) { return TRUE; } + return (citymap[tile_index(ptile)] < 0); } -- 2.47.2