]> git.lizzy.rs Git - minetest.git/commitdiff
Fix particles causing unitialised data being used due to use of incorrect union member
authorCraig Robbins <kde.psych@gmail.com>
Sun, 18 Jan 2015 06:08:49 +0000 (16:08 +1000)
committerCraig Robbins <kde.psych@gmail.com>
Sun, 18 Jan 2015 10:30:57 +0000 (20:30 +1000)
src/particles.cpp

index b32ec154294fdb604ea9cd34e11be8bd52c8b081..603e38cdd546b627ee3766e395b8e3e2e1801321 100644 (file)
@@ -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<u32, ParticleSpawner*>(
-                                                       event->delete_particlespawner.id,
+                                                       event->add_particlespawner.id,
                                                        toadd));
                }