From d92883eee914e533d038d56ae2ec56b10bf14600 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Mon, 19 Feb 2018 23:38:12 +0100 Subject: [PATCH] Replace NULL with nullptr --- src/openrct2/actions/PlacePeepSpawnAction.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/actions/PlacePeepSpawnAction.hpp b/src/openrct2/actions/PlacePeepSpawnAction.hpp index 7fa9b793bd..15bb4c11ce 100644 --- a/src/openrct2/actions/PlacePeepSpawnAction.hpp +++ b/src/openrct2/actions/PlacePeepSpawnAction.hpp @@ -77,13 +77,13 @@ public: rct_tile_element *mapElement, *surfaceMapElement; // Verify footpath exists at location, and retrieve coordinates mapElement = map_get_path_element_at(_location.x >> 5, _location.y >> 5, _location.z * 2); - if (mapElement == NULL) { + if (mapElement == nullptr) { return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_ERR_CANT_PLACE_PEEP_SPAWN_HERE, STR_CAN_ONLY_BE_BUILT_ACROSS_PATHS); } // Verify location is unowned surfaceMapElement = map_get_surface_element_at(_location.x >> 5, _location.y >> 5); - if (surfaceMapElement == NULL) { + if (surfaceMapElement == nullptr) { return std::make_unique(GA_ERROR::UNKNOWN, STR_ERR_CANT_PLACE_PEEP_SPAWN_HERE, STR_NONE); } if (surfaceMapElement->properties.surface.ownership & 0xF0) {