particle emission safeties

both for player specifically, and emission in general
This commit is contained in:
AzaezelX 2022-07-27 16:26:58 -05:00
parent 0cc49122b0
commit 77ef842670
2 changed files with 3 additions and 1 deletions

View file

@ -787,6 +787,7 @@ void ParticleEmitterData::allocPrimBuffer( S32 overrideSize )
{ {
// calculate particle list size // calculate particle list size
AssertFatal(particleDataBlocks.size() > 0, "Error, no particles found." ); AssertFatal(particleDataBlocks.size() > 0, "Error, no particles found." );
if (particleDataBlocks.empty()) return;
U32 maxPartLife = particleDataBlocks[0]->lifetimeMS + particleDataBlocks[0]->lifetimeVarianceMS; U32 maxPartLife = particleDataBlocks[0]->lifetimeMS + particleDataBlocks[0]->lifetimeVarianceMS;
for (S32 i = 1; i < particleDataBlocks.size(); i++) for (S32 i = 1; i < particleDataBlocks.size(); i++)
{ {

View file

@ -3954,7 +3954,8 @@ void Player::updateActionThread()
// Emit footpuffs. // Emit footpuffs.
if (!footfallDustOverride && rInfo.t <= 0.5f && mWaterCoverage == 0.0f if (!footfallDustOverride && rInfo.t <= 0.5f && mWaterCoverage == 0.0f
&& material && material->mShowDust ) && material && material->mShowDust
&& mDataBlock->footPuffEmitter != nullptr)
{ {
// New emitter every time for visibility reasons // New emitter every time for visibility reasons
ParticleEmitter * emitter = new ParticleEmitter; ParticleEmitter * emitter = new ParticleEmitter;