summaryrefslogtreecommitdiffstats
path: root/src/objects/ParticleObject.h
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2020-07-03 01:18:06 +0200
committerFire-Head <Fire-Head@users.noreply.github.com>2020-07-03 01:18:06 +0200
commitd4004805f5b3753955e25cfe640d6b24107e6937 (patch)
treeaaf1bf391cb4cf3f12213d65a08f373b1fee078b /src/objects/ParticleObject.h
parentFix glfw.cpp (diff)
downloadre3-d4004805f5b3753955e25cfe640d6b24107e6937.tar
re3-d4004805f5b3753955e25cfe640d6b24107e6937.tar.gz
re3-d4004805f5b3753955e25cfe640d6b24107e6937.tar.bz2
re3-d4004805f5b3753955e25cfe640d6b24107e6937.tar.lz
re3-d4004805f5b3753955e25cfe640d6b24107e6937.tar.xz
re3-d4004805f5b3753955e25cfe640d6b24107e6937.tar.zst
re3-d4004805f5b3753955e25cfe640d6b24107e6937.zip
Diffstat (limited to 'src/objects/ParticleObject.h')
-rw-r--r--src/objects/ParticleObject.h20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/objects/ParticleObject.h b/src/objects/ParticleObject.h
index 34a672bb..25261243 100644
--- a/src/objects/ParticleObject.h
+++ b/src/objects/ParticleObject.h
@@ -4,12 +4,12 @@
#include "ParticleType.h"
#include "Placeable.h"
-#define MAX_PARTICLEOBJECTS 100
+#define MAX_PARTICLEOBJECTS 70
#define MAX_AUDIOHYDRANTS 8
enum eParticleObjectType
{
- POBJECT_PAVEMENT_STEAM,
+ POBJECT_PAVEMENT_STEAM = 0,
POBJECT_PAVEMENT_STEAM_SLOWMOTION,
POBJECT_WALL_STEAM,
POBJECT_WALL_STEAM_SLOWMOTION,
@@ -22,6 +22,8 @@ enum eParticleObjectType
POBJECT_BIG_FIRE,
POBJECT_DRY_ICE,
POBJECT_DRY_ICE_SLOWMOTION,
+ POBJECT_WATER_FOUNTAIN_VERT,
+ POBJECT_WATER_FOUNTAIN_HORIZ,
POBJECT_FIRE_TRAIL,
POBJECT_SMOKE_TRAIL,
POBJECT_FIREBALL_AND_SMOKE,
@@ -69,12 +71,13 @@ public:
~CParticleObject();
static void Initialise(void);
-
- static CParticleObject *AddObject(uint16 type, CVector const &pos, uint8 remove);
- static CParticleObject *AddObject(uint16 type, CVector const &pos, float size, uint8 remove);
- static CParticleObject *AddObject(uint16 type, CVector const &pos, CVector const &target, float size, uint8 remove);
- static CParticleObject *AddObject(uint16 type, CVector const &pos, CVector const &target, float size, uint32 lifeTime, RwRGBA const &color, uint8 remove);
-
+
+ static CParticleObject *AddObject(uint16 type, CVector const &pos, uint8 remove);
+ static CParticleObject *AddObject(uint16 type, CVector const &pos, float size, uint8 remove);
+ static CParticleObject *AddObject(uint16 type, CVector const &pos, CVector const &target, float size, uint8 remove);
+ static CParticleObject *AddObject(uint16 type, CVector const &pos, CVector const &target, float size, uint32 lifeTime, RwRGBA const &color, uint8 remove);
+ static CParticleObject *AddObject(tParticleType type, CVector const &pos, CVector const &target, float size, uint32 lifeTime, uint8 numEffectCycles, uint8 skipFrames, uint16 creationChance, uint8 remove);
+
void RemoveObject(void);
static void UpdateAll(void);
@@ -84,6 +87,7 @@ public:
static bool SaveParticle(uint8 *buffer, uint32 *length);
static bool LoadParticle(uint8 *buffer, uint32 length);
+ static void RemoveAllExpireableParticleObjects(void);
static void RemoveAllParticleObjects(void);
static void MoveToList(CParticleObject **from, CParticleObject **to, CParticleObject *obj);
};