From 9fe21fcd8883b37bdc30224822e6e42afb35b8f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 7 Feb 2016 16:18:13 +0300 Subject: Replace most static_cast to shorter versions from defines. --- src/particle/particleemitter.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/particle/particleemitter.cpp') diff --git a/src/particle/particleemitter.cpp b/src/particle/particleemitter.cpp index a512cff94..d82282060 100644 --- a/src/particle/particleemitter.cpp +++ b/src/particle/particleemitter.cpp @@ -323,27 +323,27 @@ ParticleEmitter::ParticleEmitter(const XmlNodePtrConst emitterNode, mDeathEffectConditions = 0x00; if (XML::getBoolProperty(propertyNode, "on-floor", true)) { - mDeathEffectConditions += static_cast( + mDeathEffectConditions += CAST_S8( AliveStatus::DEAD_FLOOR); } if (XML::getBoolProperty(propertyNode, "on-sky", true)) { - mDeathEffectConditions += static_cast( + mDeathEffectConditions += CAST_S8( AliveStatus::DEAD_SKY); } if (XML::getBoolProperty(propertyNode, "on-other", false)) { - mDeathEffectConditions += static_cast( + mDeathEffectConditions += CAST_S8( AliveStatus::DEAD_OTHER); } if (XML::getBoolProperty(propertyNode, "on-impact", true)) { - mDeathEffectConditions += static_cast( + mDeathEffectConditions += CAST_S8( AliveStatus::DEAD_IMPACT); } if (XML::getBoolProperty(propertyNode, "on-timeout", true)) { - mDeathEffectConditions += static_cast( + mDeathEffectConditions += CAST_S8( AliveStatus::DEAD_TIMEOUT); } } @@ -593,8 +593,8 @@ void ParticleEmitter::adjustSize(const int w, const int h) return; // new dimensions are illegal // calculate the old rectangle - const int oldArea = static_cast( - mParticlePosX.maxVal - mParticlePosX.minVal) * static_cast( + const int oldArea = CAST_S32( + mParticlePosX.maxVal - mParticlePosX.minVal) * CAST_S32( mParticlePosX.maxVal - mParticlePosY.minVal); if (oldArea == 0) { @@ -610,8 +610,8 @@ void ParticleEmitter::adjustSize(const int w, const int h) // adjust the output so that the particle density stays the same const float outputFactor = static_cast(newArea) / static_cast(oldArea); - mOutput.minVal = static_cast(static_cast( + mOutput.minVal = CAST_S32(static_cast( mOutput.minVal) * outputFactor); - mOutput.maxVal = static_cast(static_cast( + mOutput.maxVal = CAST_S32(static_cast( mOutput.maxVal) * outputFactor); } -- cgit v1.2.3-60-g2f50