diff --git a/Engine/source/T3D/fx/explosion.cpp b/Engine/source/T3D/fx/explosion.cpp index 6fc59b825..d770e2f36 100644 --- a/Engine/source/T3D/fx/explosion.cpp +++ b/Engine/source/T3D/fx/explosion.cpp @@ -859,7 +859,7 @@ bool ExplosionData::preload(bool server, String &errorStr) if (Parent::preload(server, errorStr) == false) return false; - if (!server && !getSFXProfile()) + if (!server && !getSoundProfile()) return false; if( !server ) @@ -1382,7 +1382,7 @@ bool Explosion::explode() resetWorldBox(); } - SFXProfile* sound_prof = mDataBlock->getSFXProfile(); + SFXProfile* sound_prof = mDataBlock->getSoundProfile(); if (sound_prof) { soundProfile_clone = sound_prof->cloneAndPerformSubstitutions(ss_object, ss_index); diff --git a/Engine/source/T3D/fx/explosion.h b/Engine/source/T3D/fx/explosion.h index 37694dd1e..41116cd32 100644 --- a/Engine/source/T3D/fx/explosion.h +++ b/Engine/source/T3D/fx/explosion.h @@ -73,13 +73,6 @@ class ExplosionData : public GameBaseData { DECLARE_SOUNDASSET(ExplosionData, Sound); DECLARE_SOUNDASSET_SETGET(ExplosionData, Sound); - SFXProfile* getSFXProfile() { - if (mSoundAsset.notNull()) - return mSoundAsset->getSfxProfile(); - - return NULL; - } - ParticleEmitterData* particleEmitter; S32 particleEmitterId; diff --git a/Engine/source/T3D/fx/precipitation.cpp b/Engine/source/T3D/fx/precipitation.cpp index 4356cd45f..bf3246dc9 100644 --- a/Engine/source/T3D/fx/precipitation.cpp +++ b/Engine/source/T3D/fx/precipitation.cpp @@ -189,7 +189,7 @@ bool PrecipitationData::preload( bool server, String &errorStr ) if( Parent::preload( server, errorStr) == false) return false; - if (!server && !getSFXProfile()) + if (!server && !getSoundProfile()) return false; return true; @@ -597,9 +597,9 @@ bool Precipitation::onNewDataBlock( GameBaseData *dptr, bool reload ) { SFX_DELETE( mAmbientSound ); - if ( mDataBlock->getSFXProfile()) + if ( mDataBlock->getSoundProfile()) { - mAmbientSound = SFX->createSource(mDataBlock->getSFXProfile(), &getTransform() ); + mAmbientSound = SFX->createSource(mDataBlock->getSoundProfile(), &getTransform() ); if ( mAmbientSound ) mAmbientSound->play(); } diff --git a/Engine/source/T3D/fx/precipitation.h b/Engine/source/T3D/fx/precipitation.h index f9eb4bf02..719613384 100644 --- a/Engine/source/T3D/fx/precipitation.h +++ b/Engine/source/T3D/fx/precipitation.h @@ -71,13 +71,6 @@ class PrecipitationData : public GameBaseData void onDropChanged() {} void onSplashChanged() {} - - SFXProfile* getSFXProfile() { - if (mSoundAsset.notNull()) - return mSoundAsset->getSfxProfile(); - - return NULL; - } }; struct Raindrop diff --git a/Engine/source/T3D/fx/splash.cpp b/Engine/source/T3D/fx/splash.cpp index c046ef1a0..d1230e5c5 100644 --- a/Engine/source/T3D/fx/splash.cpp +++ b/Engine/source/T3D/fx/splash.cpp @@ -276,7 +276,7 @@ bool SplashData::preload(bool server, String &errorStr) if (Parent::preload(server, errorStr) == false) return false; - if (!server && !getSFXProfile()) + if (!server && !getSoundProfile()) return false; if (!server) @@ -681,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 = mDataBlock->getSFXProfile(); + SFXProfile* sound_prof = mDataBlock->getSoundProfile(); if (sound_prof) { SFX->playOnce(sound_prof, &getTransform()); diff --git a/Engine/source/T3D/fx/splash.h b/Engine/source/T3D/fx/splash.h index fec9f601e..4cde2db00 100644 --- a/Engine/source/T3D/fx/splash.h +++ b/Engine/source/T3D/fx/splash.h @@ -98,14 +98,6 @@ public: DECLARE_SOUNDASSET(SplashData, Sound); DECLARE_SOUNDASSET_SETGET(SplashData, Sound); - /// this should probably be added as a function higher up to stop repeats. - SFXProfile* getSFXProfile() { - if (mSoundAsset.notNull()) - return mSoundAsset->getSfxProfile(); - - return NULL; - } - ParticleEmitterData* emitterList[NUM_EMITTERS]; S32 emitterIDList[NUM_EMITTERS]; diff --git a/Engine/source/T3D/projectile.cpp b/Engine/source/T3D/projectile.cpp index d7532e368..a88276f73 100644 --- a/Engine/source/T3D/projectile.cpp +++ b/Engine/source/T3D/projectile.cpp @@ -882,7 +882,7 @@ bool Projectile::onNewDataBlock( GameBaseData *dptr, bool reload ) SFX_DELETE( mSound ); if ( mDataBlock->getProjectileSound() ) - mSound = SFX->createSource( mDataBlock->getSFXProfile() ); + mSound = SFX->createSource( mDataBlock->getProjectileSoundProfile() ); } return true; diff --git a/Engine/source/T3D/projectile.h b/Engine/source/T3D/projectile.h index 69bb84001..e633e3fd4 100644 --- a/Engine/source/T3D/projectile.h +++ b/Engine/source/T3D/projectile.h @@ -118,13 +118,6 @@ public: DECLARE_SOUNDASSET(ProjectileData, ProjectileSound); DECLARE_SOUNDASSET_SETGET(ProjectileData, ProjectileSound); - - SFXProfile* getSFXProfile() { - if (mProjectileSoundAsset.notNull()) - return mProjectileSoundAsset->getSfxProfile(); - - return NULL; - } LightDescription *lightDesc; S32 lightDescId;