Remove unnecessary delete checks (#318)

dev-mp
Piotr Dziwinski 2014-08-09 22:45:07 +02:00
parent ea0615ee05
commit ac019c263d
5 changed files with 9 additions and 23 deletions

View File

@ -105,7 +105,7 @@ void CBotToken::Free()
const CBotToken& CBotToken::operator=(const CBotToken& src)
{
if (m_next != NULL) delete(m_next);
delete m_next;
m_next = NULL;
m_prev = NULL;

View File

@ -42,9 +42,7 @@ void CInstanceManager::Flush()
{
for (int i = 0; i < CLASS_MAX; i++)
{
if (m_table[i].instances != nullptr)
delete[] m_table[i].instances;
delete[] m_table[i].instances;
m_table[i].instances = nullptr;
}
}

View File

@ -62,10 +62,7 @@ public:
static void ReplaceInstance(T* newInstance)
{
assert(newInstance != nullptr);
if (m_instance != nullptr)
delete m_instance;
delete m_instance;
m_instance = newInstance;
}
#endif

View File

@ -58,20 +58,14 @@ void ALSound::CleanUp()
delete channel.second;
}
if (m_currentMusic)
{
delete m_currentMusic;
}
delete m_currentMusic;
for (auto item : m_oldMusic)
{
delete item.music;
}
if (m_previousMusic.music)
{
delete m_previousMusic.music;
}
delete m_previousMusic.music;
for (auto item : m_sounds)
{

View File

@ -49,11 +49,8 @@ void CInterface::Flush()
{
for (int i = 0; i < MAXCONTROL; i++)
{
if (m_table[i] != nullptr)
{
delete m_table[i];
m_table[i] = nullptr;
}
delete m_table[i];
m_table[i] = nullptr;
}
}