summaryrefslogtreecommitdiffstats
path: root/src/objects
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-22 00:12:31 +0100
committerGitHub <noreply@github.com>2020-11-22 00:12:31 +0100
commitb9b7d5ac2110227327d950625e79aa400eaf3e47 (patch)
tree00b457d72d5abda01475944b8f5f9994c357360c /src/objects
parentReorganize CPed functions into their original cpp files (diff)
parentneo screen droplets (diff)
downloadre3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.gz
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.bz2
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.lz
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.xz
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.tar.zst
re3-b9b7d5ac2110227327d950625e79aa400eaf3e47.zip
Diffstat (limited to 'src/objects')
-rw-r--r--src/objects/ParticleObject.cpp6
-rw-r--r--src/objects/ParticleObject.h2
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