diff options
author | aap <aap@papnet.eu> | 2020-11-19 19:07:32 +0100 |
---|---|---|
committer | aap <aap@papnet.eu> | 2020-11-19 19:07:32 +0100 |
commit | 07fe099b4e1fd877176f2b2947841ee82aa91ed0 (patch) | |
tree | b76756d54baef5a3ee506875c866cd8a5947242d /src/objects | |
parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
download | re3-07fe099b4e1fd877176f2b2947841ee82aa91ed0.tar re3-07fe099b4e1fd877176f2b2947841ee82aa91ed0.tar.gz re3-07fe099b4e1fd877176f2b2947841ee82aa91ed0.tar.bz2 re3-07fe099b4e1fd877176f2b2947841ee82aa91ed0.tar.lz re3-07fe099b4e1fd877176f2b2947841ee82aa91ed0.tar.xz re3-07fe099b4e1fd877176f2b2947841ee82aa91ed0.tar.zst re3-07fe099b4e1fd877176f2b2947841ee82aa91ed0.zip |
Diffstat (limited to 'src/objects')
-rw-r--r-- | src/objects/ParticleObject.cpp | 6 | ||||
-rw-r--r-- | src/objects/ParticleObject.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp index 6ed74214..4d080d1f 100644 --- a/src/objects/ParticleObject.cpp +++ b/src/objects/ParticleObject.cpp @@ -8,6 +8,7 @@ #include "Camera.h" #include "Game.h" #include "DMAudio.h" +#include "screendroplets.h" CParticleObject gPObjectArray[MAX_PARTICLEOBJECTS]; @@ -18,6 +19,8 @@ CParticleObject *CParticleObject::pUnusedListHead; CAudioHydrant List[MAX_AUDIOHYDRANTS]; +CAudioHydrant *CAudioHydrant::Get(int n) { return &List[n]; } + bool CAudioHydrant::Add(CParticleObject *particleobject) { @@ -246,6 +249,9 @@ CParticleObject::AddObject(uint16 type, CVector const &pos, CVector const &targe pobj->m_nNumEffectCycles = 0; pobj->m_nSkipFrames = 1; pobj->m_nCreationChance = 0; +#ifdef SCREEN_DROPLETS + ScreenDroplets::RegisterSplash(pobj); +#endif break; } diff --git a/src/objects/ParticleObject.h b/src/objects/ParticleObject.h index a29d7bd4..f199e533 100644 --- a/src/objects/ParticleObject.h +++ b/src/objects/ParticleObject.h @@ -107,4 +107,6 @@ public: static bool Add (CParticleObject *particleobject); static void Remove(CParticleObject *particleobject); + + static CAudioHydrant *Get(int n); // for neo screen droplets };
\ No newline at end of file |