mirror of
https://github.com/minetest/minetest.git
synced 2024-08-20 05:24:15 +02:00
Remove superfluous pointer null checks
This commit is contained in:
parent
7bfd53ba58
commit
5cc8ad946e
@ -490,10 +490,8 @@ void Client::step(float dtime)
|
||||
MapBlock *block = m_env.getMap().getBlockNoCreateNoEx(r.p);
|
||||
if (block) {
|
||||
// Delete the old mesh
|
||||
if (block->mesh != NULL) {
|
||||
delete block->mesh;
|
||||
block->mesh = NULL;
|
||||
}
|
||||
delete block->mesh;
|
||||
block->mesh = NULL;
|
||||
|
||||
if (r.mesh) {
|
||||
minimap_mapblock = r.mesh->moveMinimapMapblock();
|
||||
|
@ -53,14 +53,11 @@ MainGameCallback *g_gamecallback = NULL;
|
||||
|
||||
ClientLauncher::~ClientLauncher()
|
||||
{
|
||||
if (receiver)
|
||||
delete receiver;
|
||||
delete receiver;
|
||||
|
||||
if (input)
|
||||
delete input;
|
||||
delete input;
|
||||
|
||||
if (g_fontengine)
|
||||
delete g_fontengine;
|
||||
delete g_fontengine;
|
||||
|
||||
if (device)
|
||||
device->drop();
|
||||
|
@ -3231,8 +3231,7 @@ void Game::processClientEvents(CameraOrientation *cam)
|
||||
{
|
||||
HudElement *e = player->removeHud(event.hudrm.id);
|
||||
|
||||
if (e != NULL)
|
||||
delete e;
|
||||
delete e;
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -134,13 +134,8 @@ GUIFormSpecMenu::~GUIFormSpecMenu()
|
||||
}
|
||||
|
||||
delete m_selected_item;
|
||||
|
||||
if (m_form_src != NULL) {
|
||||
delete m_form_src;
|
||||
}
|
||||
if (m_text_dst != NULL) {
|
||||
delete m_text_dst;
|
||||
}
|
||||
delete m_form_src;
|
||||
delete m_text_dst;
|
||||
}
|
||||
|
||||
void GUIFormSpecMenu::removeChildren()
|
||||
|
@ -310,18 +310,14 @@ public:
|
||||
// form_src is deleted by this GUIFormSpecMenu
|
||||
void setFormSource(IFormSource *form_src)
|
||||
{
|
||||
if (m_form_src != NULL) {
|
||||
delete m_form_src;
|
||||
}
|
||||
delete m_form_src;
|
||||
m_form_src = form_src;
|
||||
}
|
||||
|
||||
// text_dst is deleted by this GUIFormSpecMenu
|
||||
void setTextDest(TextDest *text_dst)
|
||||
{
|
||||
if (m_text_dst != NULL) {
|
||||
delete m_text_dst;
|
||||
}
|
||||
delete m_text_dst;
|
||||
m_text_dst = text_dst;
|
||||
}
|
||||
|
||||
|
@ -112,11 +112,8 @@ void ItemDefinition::reset()
|
||||
stack_max = 99;
|
||||
usable = false;
|
||||
liquids_pointable = false;
|
||||
if(tool_capabilities)
|
||||
{
|
||||
delete tool_capabilities;
|
||||
tool_capabilities = NULL;
|
||||
}
|
||||
delete tool_capabilities;
|
||||
tool_capabilities = NULL;
|
||||
groups.clear();
|
||||
sound_place = SimpleSoundSpec();
|
||||
sound_place_failed = SimpleSoundSpec();
|
||||
|
@ -97,16 +97,12 @@ MapBlock::~MapBlock()
|
||||
{
|
||||
//MutexAutoLock lock(mesh_mutex);
|
||||
|
||||
if(mesh)
|
||||
{
|
||||
delete mesh;
|
||||
mesh = NULL;
|
||||
}
|
||||
delete mesh;
|
||||
mesh = NULL;
|
||||
}
|
||||
#endif
|
||||
|
||||
if(data)
|
||||
delete[] data;
|
||||
delete[] data;
|
||||
}
|
||||
|
||||
bool MapBlock::isValidPositionParent(v3s16 p)
|
||||
|
@ -40,8 +40,7 @@ CachedMapBlockData::~CachedMapBlockData()
|
||||
{
|
||||
assert(refcount_from_queue == 0);
|
||||
|
||||
if (data)
|
||||
delete[] data;
|
||||
delete[] data;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -60,8 +59,7 @@ QueuedMeshUpdate::QueuedMeshUpdate():
|
||||
|
||||
QueuedMeshUpdate::~QueuedMeshUpdate()
|
||||
{
|
||||
if (data)
|
||||
delete data;
|
||||
delete data;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -97,8 +97,7 @@ public:
|
||||
private:
|
||||
void drop()
|
||||
{
|
||||
if(data)
|
||||
delete[] data;
|
||||
delete[] data;
|
||||
}
|
||||
T *data;
|
||||
unsigned int m_size;
|
||||
@ -214,8 +213,7 @@ private:
|
||||
(*refcount)--;
|
||||
if(*refcount == 0)
|
||||
{
|
||||
if(data)
|
||||
delete[] data;
|
||||
delete[] data;
|
||||
delete refcount;
|
||||
}
|
||||
}
|
||||
|
@ -861,7 +861,7 @@ err_exit:
|
||||
mpz_clear(usr->a);
|
||||
mpz_clear(usr->A);
|
||||
mpz_clear(usr->S);
|
||||
if (usr->ng) delete_ng(usr->ng);
|
||||
delete_ng(usr->ng);
|
||||
srp_free(usr->username);
|
||||
srp_free(usr->username_verifier);
|
||||
if (usr->password) {
|
||||
|
Loading…
Reference in New Issue
Block a user