From af3057df7eb41973349b407539846f17d9094c21 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 4 Jul 2012 19:56:22 +0200 Subject: Merged changes from dev Resolved conflicts & added fixes. --- src/graphics/common/particle.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/graphics') diff --git a/src/graphics/common/particle.h b/src/graphics/common/particle.h index 62d001d..ec87648 100644 --- a/src/graphics/common/particle.h +++ b/src/graphics/common/particle.h @@ -26,6 +26,7 @@ class CInstanceManager; class CRobotMain; class CObject; +class CSound; @@ -303,7 +304,7 @@ protected: void DrawParticleWheel(int i); CObject* SearchObjectGun(Math::Vector old, Math::Vector pos, ParticleType type, CObject *father); CObject* SearchObjectRay(Math::Vector pos, Math::Vector goal, ParticleType type, CObject *father); - void Play(Snd::Sound sound, Math::Vector pos, float amplitude); + void Play(Sound sound, Math::Vector pos, float amplitude); bool TrackMove(int i, Math::Vector pos, float progress); void TrackDraw(int i, ParticleType type); @@ -314,7 +315,7 @@ protected: CRobotMain* m_main; CTerrain* m_terrain; CWater* m_water; - Snd::CSound* m_sound; + CSound* m_sound; Gfx::Particle m_particule[MAXPARTICULE*MAXPARTITYPE]; Gfx::Triangle m_triangle[MAXPARTICULE]; // triangle if PartiType == 0 -- cgit v1.2.3-1-g7c22