Mgvalleys: use standard caves

[minetest.git] / src / particles.cpp

diff --git a/src/particles.cpp b/src/particles.cpp
index 15e2a6597b952bec34dbafcdf9269a25a080599f..8150e19acb90e92a20aad3c7713813f53fe160fa 100644 (file)
--- a/src/particles.cpp
+++ b/src/particles.cpp
@@ -131,14 +131,12 @@ void Particle::step(float dtime)
                core::aabbox3d<f32> box = m_collisionbox;
                v3f p_pos = m_pos*BS;
                v3f p_velocity = m_velocity*BS;
-               v3f p_acceleration = m_acceleration*BS;
                collisionMoveSimple(m_env, m_gamedef,
                        BS*0.5, box,
                        0, dtime,
-                       p_pos, p_velocity, p_acceleration);
+                       &p_pos, &p_velocity, m_acceleration * BS);
                m_pos = p_pos/BS;
                m_velocity = p_velocity/BS;
-               m_acceleration = p_acceleration/BS;
        }
        else
        {
@@ -288,7 +286,7 @@ void ParticleSpawner::step(float dtime, ClientEnvironment* env)
                        }
                        else
                        {
-                               i++;
+                               ++i;
                        }
                }
        }
@@ -347,7 +345,7 @@ void ParticleManager::step(float dtime)
 
 void ParticleManager::stepSpawners (float dtime)
 {
-       JMutexAutoLock lock(m_spawner_list_lock);
+       MutexAutoLock lock(m_spawner_list_lock);
        for(std::map<u32, ParticleSpawner*>::iterator i = 
                        m_particle_spawners.begin();
                        i != m_particle_spawners.end();)
@@ -360,14 +358,14 @@ void ParticleManager::stepSpawners (float dtime)
                else
                {
                        i->second->step(dtime, m_env);
-                       i++;
+                       ++i;
                }
        }
 }
 
 void ParticleManager::stepParticles (float dtime)
 {
-       JMutexAutoLock lock(m_particle_list_lock);
+       MutexAutoLock lock(m_particle_list_lock);
        for(std::vector<Particle*>::iterator i = m_particles.begin();
                        i != m_particles.end();)
        {
@@ -380,15 +378,15 @@ void ParticleManager::stepParticles (float dtime)
                else
                {
                        (*i)->step(dtime);
-                       i++;
+                       ++i;
                }
        }
 }
 
 void ParticleManager::clearAll ()
 {
-       JMutexAutoLock lock(m_spawner_list_lock);
-       JMutexAutoLock lock2(m_particle_list_lock);
+       MutexAutoLock lock(m_spawner_list_lock);
+       MutexAutoLock lock2(m_particle_list_lock);
        for(std::map<u32, ParticleSpawner*>::iterator i =
                        m_particle_spawners.begin();
                        i != m_particle_spawners.end();)
@@ -411,7 +409,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
                scene::ISceneManager* smgr, LocalPlayer *player)
 {
        if (event->type == CE_DELETE_PARTICLESPAWNER) {
-               JMutexAutoLock lock(m_spawner_list_lock);
+               MutexAutoLock lock(m_spawner_list_lock);
                if (m_particle_spawners.find(event->delete_particlespawner.id) !=
                                m_particle_spawners.end())
                {
@@ -425,7 +423,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
        if (event->type == CE_ADD_PARTICLESPAWNER) {
 
                {
-                       JMutexAutoLock lock(m_spawner_list_lock);
+                       MutexAutoLock lock(m_spawner_list_lock);
                        if (m_particle_spawners.find(event->add_particlespawner.id) !=
                                                        m_particle_spawners.end())
                        {
@@ -465,7 +463,7 @@ void ParticleManager::handleParticleEvent(ClientEvent *event, IGameDef *gamedef,
                delete event->add_particlespawner.maxacc;
 
                {
-                       JMutexAutoLock lock(m_spawner_list_lock);
+                       MutexAutoLock lock(m_spawner_list_lock);
                        m_particle_spawners.insert(
                                        std::pair<u32, ParticleSpawner*>(
                                                        event->add_particlespawner.id,
@@ -568,6 +566,6 @@ void ParticleManager::addNodeParticle(IGameDef* gamedef, scene::ISceneManager* s
 
 void ParticleManager::addParticle(Particle* toadd)
 {
-       JMutexAutoLock lock(m_particle_list_lock);
+       MutexAutoLock lock(m_particle_list_lock);
        m_particles.push_back(toadd);
 }