diff options
| author | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-22 00:59:08 +0100 |
|---|---|---|
| committer | Fire-Head <Fire-Head@users.noreply.github.com> | 2021-01-22 00:59:08 +0100 |
| commit | 37b9ba5bd7a7cd8b998d9e2489531bf446c19d88 (patch) | |
| tree | c6c2a6e61644d3b71b217c50f10161d05a618d5a /src/objects | |
| parent | Merge branch 'lcs' of https://github.com/Fire-Head/re3 into lcs (diff) | |
| download | re3-37b9ba5bd7a7cd8b998d9e2489531bf446c19d88.tar re3-37b9ba5bd7a7cd8b998d9e2489531bf446c19d88.tar.gz re3-37b9ba5bd7a7cd8b998d9e2489531bf446c19d88.tar.bz2 re3-37b9ba5bd7a7cd8b998d9e2489531bf446c19d88.tar.lz re3-37b9ba5bd7a7cd8b998d9e2489531bf446c19d88.tar.xz re3-37b9ba5bd7a7cd8b998d9e2489531bf446c19d88.tar.zst re3-37b9ba5bd7a7cd8b998d9e2489531bf446c19d88.zip | |
Diffstat (limited to 'src/objects')
| -rw-r--r-- | src/objects/ParticleObject.cpp | 11 | ||||
| -rw-r--r-- | src/objects/ParticleObject.h | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/objects/ParticleObject.cpp b/src/objects/ParticleObject.cpp index 4d080d1f..a281062f 100644 --- a/src/objects/ParticleObject.cpp +++ b/src/objects/ParticleObject.cpp @@ -242,6 +242,16 @@ CParticleObject::AddObject(uint16 type, CVector const &pos, CVector const &targe break; } + case POBJECT_FIRE_HYDRANT_STEAM: + { + pobj->m_ParticleType = PARTICLE_HYDRANT_STEAM; + pobj->m_nNumEffectCycles = 2; + pobj->m_nSkipFrames = 2; + pobj->m_nCreationChance = 8; + pobj->m_nRemoveTimer = CTimer::GetTimeInMilliseconds() + 5000; + break; + } + case POBJECT_CAR_WATER_SPLASH: case POBJECT_PED_WATER_SPLASH: { @@ -921,6 +931,7 @@ void CParticleObject::UpdateClose(void) CParticle::AddParticle(PARTICLE_CAR_SPLASH, splashpos, splashvel, nil, CGeneral::GetRandomNumberInRange(0.005f, 0.0075f), this->m_Color, 0, 0, 1, 300); } + for ( int32 i = 0; i < this->m_nNumEffectCycles; i++ ) { CParticle::AddParticle(this->m_ParticleType, pos, vel, nil, 0.0f, this->m_Color); diff --git a/src/objects/ParticleObject.h b/src/objects/ParticleObject.h index f199e533..78c6eaf0 100644 --- a/src/objects/ParticleObject.h +++ b/src/objects/ParticleObject.h @@ -15,6 +15,7 @@ enum eParticleObjectType POBJECT_WALL_STEAM_SLOWMOTION, POBJECT_DARK_SMOKE, POBJECT_FIRE_HYDRANT, + POBJECT_FIRE_HYDRANT_STEAM, POBJECT_CAR_WATER_SPLASH, POBJECT_PED_WATER_SPLASH, POBJECT_SPLASHES_AROUND, @@ -49,14 +50,14 @@ public: CParticleObject *m_pNext; CParticleObject *m_pPrev; CParticle *m_pParticle; - uint32 m_nRemoveTimer; + uint32 m_nRemoveTimer; eParticleObjectType m_Type; tParticleType m_ParticleType; uint8 m_nNumEffectCycles; uint8 m_nSkipFrames; uint16 m_nFrameCounter; uint16 m_nState; - CVector m_vecTarget; + CVector m_vecTarget; // CVuVector on PSP float m_fRandVal; float m_fSize; CRGBA m_Color; |