summaryrefslogtreecommitdiffstats
path: root/src/render/Particle.cpp
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-08-15 16:52:12 +0200
committereray orçunus <erayorcunus@gmail.com>2019-08-15 16:54:49 +0200
commit8f18f848363ba71ee74f13f88ac5a6c5da78b3ba (patch)
tree35bac433fe9a98acdaae40c62cb8753ce422aa54 /src/render/Particle.cpp
parentAnimViewer! (diff)
parentMerge pull request #190 from Fire-Head/master (diff)
downloadre3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.gz
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.bz2
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.lz
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.xz
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.tar.zst
re3-8f18f848363ba71ee74f13f88ac5a6c5da78b3ba.zip
Diffstat (limited to '')
-rw-r--r--src/render/Particle.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index 23e23f93..e2db55c7 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -1261,7 +1261,7 @@ void CParticle::Update()
nil,
particle->m_fSize, color, particle->m_nRotationStep, 0, 0, 0);
- PlayOneShotScriptObject(_SOUND_BULLET_SHELL_HIT_GROUND_1, particle->m_vecPosition);
+ PlayOneShotScriptObject(_SCRSOUND_BULLET_SHELL_HIT_GROUND_1, particle->m_vecPosition);
}
break;
@@ -1280,7 +1280,7 @@ void CParticle::Update()
nil,
particle->m_fSize, color, 0, 0, 0, 0);
- PlayOneShotScriptObject(_SOUND_BULLET_SHELL_HIT_GROUND_2, particle->m_vecPosition);
+ PlayOneShotScriptObject(_SCRSOUND_BULLET_SHELL_HIT_GROUND_2, particle->m_vecPosition);
}
break;
@@ -1410,13 +1410,11 @@ void CParticle::Update()
if ( particle->m_fCurrentZRadius != 0.0f )
{
- int32 nSinCosIndex = particle->m_nCurrentZRotation % (SIN_COS_TABLE_SIZE - 1);
+ int32 nRot = particle->m_nCurrentZRotation % (SIN_COS_TABLE_SIZE - 1);
- float fX = (m_CosTable[nSinCosIndex] - m_SinTable[nSinCosIndex])
- * particle->m_fCurrentZRadius;
+ float fX = (Cos(nRot) - Sin(nRot)) * particle->m_fCurrentZRadius;
- float fY = (m_SinTable[nSinCosIndex] + m_CosTable[nSinCosIndex])
- * particle->m_fCurrentZRadius;
+ float fY = (Sin(nRot) + Cos(nRot)) * particle->m_fCurrentZRadius;
moveStep -= particle->m_vecParticleMovementOffset;