From 29514918f81e50e9a87659dd930f4e8369d73041 Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Sun, 18 Jan 2015 16:08:49 +1000 Subject: [PATCH] Fix particles causing unitialised data being used due to use of incorrect union member --- src/particles.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/particles.cpp b/src/particles.cpp index b32ec1542..603e38cdd 100644 --- a/src/particles.cpp +++ b/src/particles.cpp @@ -433,11 +433,11 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef, { JMutexAutoLock lock(m_spawner_list_lock); - if (m_particle_spawners.find(event->delete_particlespawner.id) != + if (m_particle_spawners.find(event->add_particlespawner.id) != m_particle_spawners.end()) { - delete m_particle_spawners.find(event->delete_particlespawner.id)->second; - m_particle_spawners.erase(event->delete_particlespawner.id); + delete m_particle_spawners.find(event->add_particlespawner.id)->second; + m_particle_spawners.erase(event->add_particlespawner.id); } } video::ITexture *texture = @@ -475,7 +475,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef, JMutexAutoLock lock(m_spawner_list_lock); m_particle_spawners.insert( std::pair( - event->delete_particlespawner.id, + event->add_particlespawner.id, toadd)); }