From 895266e75fca3495275e1a1a16fa8838aec4e4a0 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Tue, 10 Jun 2025 08:41:54 +0300
Subject: [PATCH 91/91] vision.[ch]: Replace NULL with nullptr

See RM #1504

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 common/vision.c | 16 ++++++++--------
 common/vision.h |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/vision.c b/common/vision.c
index 1f5cc58fe8..bc1aaa02fa 100644
--- a/common/vision.c
+++ b/common/vision.c
@@ -73,7 +73,7 @@ bool vision_reveal_tiles(struct vision *vision, bool reveal_tiles)
 ****************************************************************************/
 void vision_site_destroy(struct vision_site *psite)
 {
-  if (psite->name != NULL) {
+  if (psite->name != nullptr) {
     free(psite->name);
   }
 
@@ -91,7 +91,7 @@ struct vision_site *vision_site_new(int identity, struct tile *location,
   psite->identity = identity;
   psite->location = location;
   psite->owner = owner;
-  psite->original = NULL;
+  psite->original = nullptr;
 
   return psite;
 }
@@ -111,7 +111,7 @@ struct vision_site *vision_site_new_from_city(const struct city *pcity,
   if (watcher == pcity->original) {
     psite->original = pcity->original;
   } else {
-    psite->original = NULL;
+    psite->original = nullptr;
   }
 
   return psite;
@@ -133,12 +133,12 @@ void vision_site_update_from_city(struct vision_site *psite,
   if (watcher == pcity->original) {
     psite->original = pcity->original;
   } else {
-    psite->original = NULL;
+    psite->original = nullptr;
   }
 
   vision_site_size_set(psite, city_size_get(pcity));
 
-  if (psite->name != NULL) {
+  if (psite->name != nullptr) {
     free(psite->name);
   }
   psite->name = fc_strdup(city_name_get(pcity));
@@ -157,7 +157,7 @@ struct vision_site *vision_site_copy(const struct vision_site *psite)
   *copy = *psite;
 
   /* Then allocate things that aren't shared */
-  if (psite->name != NULL) {
+  if (psite->name != nullptr) {
     copy->name = fc_strdup(psite->name);
   }
 
@@ -169,7 +169,7 @@ struct vision_site *vision_site_copy(const struct vision_site *psite)
 ****************************************************************************/
 citizens vision_site_size_get(const struct vision_site *psite)
 {
-  fc_assert_ret_val(psite != NULL, 0);
+  fc_assert_ret_val(psite != nullptr, 0);
 
   return psite->size;
 }
@@ -179,7 +179,7 @@ citizens vision_site_size_get(const struct vision_site *psite)
 ****************************************************************************/
 void vision_site_size_set(struct vision_site *psite, citizens size)
 {
-  fc_assert_ret(psite != NULL);
+  fc_assert_ret(psite != nullptr);
 
   psite->size = size;
 }
diff --git a/common/vision.h b/common/vision.h
index c803b164ce..fa7d8bea34 100644
--- a/common/vision.h
+++ b/common/vision.h
@@ -108,9 +108,9 @@ bool vision_reveal_tiles(struct vision *vision, bool reveal_tiles);
 
 struct vision_site {
   char *name;
-  struct tile *location; /* Cannot be NULL */
-  struct player *owner;  /* May be NULL, always check! */
-  struct player *original; /* Can be NULL, even in case of a city */
+  struct tile *location; /* Cannot be nullptr */
+  struct player *owner;  /* May be nullptr, always check! */
+  struct player *original; /* Can be nullptr, even in case of a city */
 
   int identity;          /* city > IDENTITY_NUMBER_ZERO */
   citizens size;         /* city size (0 <= size <= MAX_CITY_SIZE) */
@@ -144,4 +144,4 @@ void vision_site_size_set(struct vision_site *psite, citizens size);
 }
 #endif /* __cplusplus */
 
-#endif  /* FC__VISION_H */
+#endif /* FC__VISION_H */
-- 
2.47.2