From 44dad256904aad8dff0ec1626562a568f4a5cd00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 14 Nov 2011 09:24:36 +0100 Subject: [PATCH] No nullptr, propector -> prospect --- README.rst | 4 ++-- library/Core.cpp | 2 +- library/modules/Creatures.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.rst b/README.rst index 91d9b4d64..926ec929a 100644 --- a/README.rst +++ b/README.rst @@ -293,8 +293,8 @@ probe ===== Can be used to determine tile properties like temperature. -prospector -============ +prospect +======== Lists all available minerals on the map, how much of them there is and the z-levels where they can be found. By default, only processes the already discovered part of the map. Options diff --git a/library/Core.cpp b/library/Core.cpp index 5bc244ca1..077c368d5 100644 --- a/library/Core.cpp +++ b/library/Core.cpp @@ -455,7 +455,7 @@ bool Core::Init() out << "Error while reading Memory.xml:\n"; out << err.what() << std::endl; delete vif; - vif = nullptr; + vif = NULL; errorstate = true; fatal(out.str(), true); return false; diff --git a/library/modules/Creatures.cpp b/library/modules/Creatures.cpp index 1e1da1bac..95591157d 100644 --- a/library/modules/Creatures.cpp +++ b/library/modules/Creatures.cpp @@ -120,11 +120,11 @@ bool Creatures::Finish() df_creature * Creatures::GetCreature (const int32_t index) { - if(!d->Started) return nullptr; + if(!d->Started) return NULL; // read pointer from vector at position if(index > creatures->size()) - return nullptr; + return 0; return creatures->at(index); } @@ -156,7 +156,7 @@ int32_t Creatures::GetCreatureInBox (int32_t index, df_creature ** furball, } index++; } - *furball = nullptr; + *furball = NULL; return -1; }