TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

QOC

Browse source 
Code cleaning of unnecessary else'
Remove unnecessary dynamic_casts
This commit is contained in:
marauder2k7 2021-09-20 17:57:16 +01:00
parent e9d0f68b55
commit 57aceb60fb
13 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/fx/explosion.cpp
View file

@ -1382,7 +1382,7 @@ bool Explosion::explode()
resetWorldBox();
}
SFXProfile* sound_prof = dynamic_cast<SFXProfile*>(mDataBlock->getSFXProfile());
SFXProfile* sound_prof = mDataBlock->getSFXProfile();
if (sound_prof)
{
soundProfile_clone = sound_prof->cloneAndPerformSubstitutions(ss_object, ss_index);

4
Engine/source/T3D/fx/explosion.h
View file

@ -76,8 +76,8 @@ class ExplosionData : public GameBaseData {
SFXProfile* getSFXProfile() {
if (mSoundAsset.notNull())
return mSoundAsset->getSfxProfile();
else
return NULL;
return NULL;
}
ParticleEmitterData* particleEmitter;

2
Engine/source/T3D/fx/lightning.cpp
View file

@ -241,7 +241,9 @@ LightningData::LightningData()
INIT_SOUNDASSET(StrikeSound);
for (S32 i = 0; i < MaxThunders; i++)
{
INIT_SOUNDASSET_ARRAY(ThunderSound, MaxThunders);
}
for (S32 i = 0; i < MaxTextures; i++)
{

8
Engine/source/T3D/fx/lightning.h
View file

@ -97,15 +97,15 @@ class LightningData : public GameBaseData
{
if (mThunderSoundAsset[id] != NULL)
return mThunderSoundAsset[id]->getSfxProfile();
else
return NULL;
return NULL;
}
SFXProfile* getSFXProfile() {
if (mStrikeSoundAsset.notNull())
return mStrikeSoundAsset->getSfxProfile();
else
return NULL;
return NULL;
}
};

4
Engine/source/T3D/fx/precipitation.h
View file

@ -75,8 +75,8 @@ class PrecipitationData : public GameBaseData
SFXProfile* getSFXProfile() {
if (mSoundAsset.notNull())
return mSoundAsset->getSfxProfile();
else
return NULL;
return NULL;
}
};

4
Engine/source/T3D/fx/splash.cpp
View file

@ -97,7 +97,9 @@ SplashData::SplashData()
U32 i;
for (i = 0; i < NUM_TEX; i++)
{
INIT_IMAGEASSET_ARRAY(Texture, i);
}
for( i=0; i<NUM_TIME_KEYS; i++ )
times[i] = 1.0;
@ -679,7 +681,7 @@ void Splash::spawnExplosion()
/// could just play the explosion one, but explosion could be weapon specific,
/// splash sound could be liquid specific. food for thought.
SFXProfile* sound_prof = dynamic_cast<SFXProfile*>(mDataBlock->getSFXProfile());
SFXProfile* sound_prof = mDataBlock->getSFXProfile();
if (sound_prof)
{
SFX->playOnce(sound_prof, &getTransform());

4
Engine/source/T3D/fx/splash.h
View file

@ -102,8 +102,8 @@ public:
SFXProfile* getSFXProfile() {
if (mSoundAsset.notNull())
return mSoundAsset->getSfxProfile();
else
return NULL;
return NULL;
}
ParticleEmitterData* emitterList[NUM_EMITTERS];