diff options
Diffstat (limited to 'src/particles.h')
| -rw-r--r-- | src/particles.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/particles.h b/src/particles.h index 2bc2e7bfa..dda84385c 100644 --- a/src/particles.h +++ b/src/particles.h @@ -52,7 +52,7 @@ class Particle : public scene::ISceneNode ); ~Particle(); - virtual const core::aabbox3d<f32>& getBoundingBox() const + virtual const aabb3f &getBoundingBox() const { return m_box; } @@ -85,8 +85,8 @@ private: ClientEnvironment *m_env; IGameDef *m_gamedef; - core::aabbox3d<f32> m_box; - core::aabbox3d<f32> m_collisionbox; + aabb3f m_box; + aabb3f m_collisionbox; video::SMaterial m_material; v2f m_texpos; v2f m_texsize; @@ -190,8 +190,8 @@ private: std::map<u32, ParticleSpawner*> m_particle_spawners; ClientEnvironment* m_env; - JMutex m_particle_list_lock; - JMutex m_spawner_list_lock; + Mutex m_particle_list_lock; + Mutex m_spawner_list_lock; }; #endif |