archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-10-08 12:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #976 from Fire-Head/lcs

Browse Source 
Lcs pobj
This commit is contained in:
aap
2021-01-22 01:12:03 +01:00
committed by GitHub
parent ce77e80414 6bdf005171
commit c8236d0dd2
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/objects/ParticleObject.cpp
View File

@@ -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);

5
src/objects/ParticleObject.h
View File

@@ -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,7 +50,7 @@ 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;
@@ -109,4 +110,4 @@ public:
static void Remove(CParticleObject *particleobject);
static CAudioHydrant *Get(int n); // for neo screen droplets
};
};