No nullptr, propector -> prospect

develop
Petr Mrázek 2011-11-14 09:24:36 +01:00
parent 7e475970fb
commit 44dad25690
3 changed files with 6 additions and 6 deletions

@ -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

@ -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;

@ -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;
}