diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-07-04 19:56:22 +0200 |
| commit | af3057df7eb41973349b407539846f17d9094c21 (patch) | |
| tree | 0940a188a0cfc43a99505f55513516866a57d145 /src/graphics | |
| parent | f95df35dc58e01b99ffddfc4ad394feaa4460b09 (diff) | |
| download | colobot-af3057df7eb41973349b407539846f17d9094c21.tar.gz colobot-af3057df7eb41973349b407539846f17d9094c21.tar.bz2 colobot-af3057df7eb41973349b407539846f17d9094c21.zip | |
Merged changes from dev
Resolved conflicts & added fixes.
Diffstat (limited to 'src/graphics')
| -rw-r--r-- | src/graphics/common/particle.h | 5 |
1 files changed, 3 insertions, 2 deletions
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 |