TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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(); resetWorldBox();
} }
SFXProfile* sound_prof = dynamic_cast<SFXProfile*>(mDataBlock->getSFXProfile()); SFXProfile* sound_prof = mDataBlock->getSFXProfile();
if (sound_prof) if (sound_prof)
{ {
soundProfile_clone = sound_prof->cloneAndPerformSubstitutions(ss_object, ss_index); soundProfile_clone = sound_prof->cloneAndPerformSubstitutions(ss_object, ss_index);

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

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

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

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

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

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

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

@ -75,7 +75,7 @@ class PrecipitationData : public GameBaseData
SFXProfile* getSFXProfile() { SFXProfile* getSFXProfile() {
if (mSoundAsset.notNull()) if (mSoundAsset.notNull())
return mSoundAsset->getSfxProfile(); 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; U32 i;
for (i = 0; i < NUM_TEX; i++) for (i = 0; i < NUM_TEX; i++)
{
INIT_IMAGEASSET_ARRAY(Texture, i); INIT_IMAGEASSET_ARRAY(Texture, i);
}
for( i=0; i<NUM_TIME_KEYS; i++ ) for( i=0; i<NUM_TIME_KEYS; i++ )
times[i] = 1.0; times[i] = 1.0;
@ -679,7 +681,7 @@ void Splash::spawnExplosion()
/// could just play the explosion one, but explosion could be weapon specific, /// could just play the explosion one, but explosion could be weapon specific,
/// splash sound could be liquid specific. food for thought. /// 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) if (sound_prof)
{ {
SFX->playOnce(sound_prof, &getTransform()); SFX->playOnce(sound_prof, &getTransform());

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

@ -102,7 +102,7 @@ public:
SFXProfile* getSFXProfile() { SFXProfile* getSFXProfile() {
if (mSoundAsset.notNull()) if (mSoundAsset.notNull())
return mSoundAsset->getSfxProfile(); return mSoundAsset->getSfxProfile();
else
return NULL; return NULL;
} }

3
Engine/source/T3D/projectile.h
View file

@ -118,10 +118,11 @@ public:
DECLARE_SOUNDASSET(ProjectileData, ProjectileSound); DECLARE_SOUNDASSET(ProjectileData, ProjectileSound);
DECLARE_SOUNDASSET_SETGET(ProjectileData, ProjectileSound); DECLARE_SOUNDASSET_SETGET(ProjectileData, ProjectileSound);
SFXProfile* getSFXProfile() { SFXProfile* getSFXProfile() {
if (mProjectileSoundAsset.notNull()) if (mProjectileSoundAsset.notNull())
return mProjectileSoundAsset->getSfxProfile(); return mProjectileSoundAsset->getSfxProfile();
else
return NULL; return NULL;
} }

4
Engine/source/T3D/rigidShape.h
View file

@ -70,7 +70,7 @@ class RigidShapeData : public ShapeBaseData
{ {
if (mBodySoundsAsset[id] != NULL) if (mBodySoundsAsset[id] != NULL)
return mBodySoundsAsset[id]->getSfxProfile(); return mBodySoundsAsset[id]->getSfxProfile();
else
return NULL; return NULL;
} }
@ -98,7 +98,7 @@ class RigidShapeData : public ShapeBaseData
{ {
if (mWaterSoundsAsset[id] != NULL) if (mWaterSoundsAsset[id] != NULL)
return mWaterSoundsAsset[id]->getSfxProfile(); return mWaterSoundsAsset[id]->getSfxProfile();
else
return NULL; return NULL;
} }

2
Engine/source/T3D/vehicles/flyingVehicle.h
View file

@ -51,7 +51,7 @@ struct FlyingVehicleData: public VehicleData {
{ {
if (mFlyingSoundsAsset[id] != NULL) if (mFlyingSoundsAsset[id] != NULL)
return mFlyingSoundsAsset[id]->getSfxProfile(); return mFlyingSoundsAsset[id]->getSfxProfile();
else
return NULL; return NULL;
} }

2
Engine/source/T3D/vehicles/hoverVehicle.h
View file

@ -52,7 +52,7 @@ class HoverVehicleData : public VehicleData
{ {
if (mHoverSoundsAsset[id] != NULL) if (mHoverSoundsAsset[id] != NULL)
return mHoverSoundsAsset[id]->getSfxProfile(); return mHoverSoundsAsset[id]->getSfxProfile();
else
return NULL; return NULL;
} }

4
Engine/source/T3D/vehicles/vehicle.h
View file

@ -56,7 +56,7 @@ struct VehicleData : public RigidShapeData
{ {
if (mVehicleBodySoundsAsset[id] != NULL) if (mVehicleBodySoundsAsset[id] != NULL)
return mVehicleBodySoundsAsset[id]->getSfxProfile(); return mVehicleBodySoundsAsset[id]->getSfxProfile();
else
return NULL; return NULL;
} }
@ -88,7 +88,7 @@ struct VehicleData : public RigidShapeData
{ {
if (mVehicleWaterSoundsAsset[id] != NULL) if (mVehicleWaterSoundsAsset[id] != NULL)
return mVehicleWaterSoundsAsset[id]->getSfxProfile(); return mVehicleWaterSoundsAsset[id]->getSfxProfile();
else
return NULL; return NULL;
} }

2
Engine/source/T3D/vehicles/wheeledVehicle.h
View file

@ -125,7 +125,7 @@ struct WheeledVehicleData: public VehicleData
{ {
if (mWheeledVehicleSoundsAsset[id] != NULL) if (mWheeledVehicleSoundsAsset[id] != NULL)
return mWheeledVehicleSoundsAsset[id]->getSfxProfile(); return mWheeledVehicleSoundsAsset[id]->getSfxProfile();
else
return NULL; return NULL;
} }