Merge pull request #1230 from Azaezel/notSoShocking

removal of  un-implemented ShockwaveData entries from explosion.

Engine/source/T3D/fx/explosion.cpp

@@ -254,10 +254,6 @@ ExplosionData::ExplosionData()
    lifetimeVariance = 0;
    offset = 0.0f;
 
-   shockwave = NULL;
-   shockwaveID = 0;
-   shockwaveOnTerrain = false;
-
    shakeCamera = false;
    camShakeFreq.set( 10.0f, 10.0f, 10.0f );
    camShakeAmp.set( 1.0f, 1.0f, 1.0f );
@@ -321,9 +317,6 @@ void ExplosionData::initPersistFields()
       "explosion.\n\n"
       "@see particleEmitter" );
 
-//   addField( "shockwave", TypeShockwaveDataPtr, Offset(shockwave, ExplosionData) );
-//   addField( "shockwaveOnTerrain", TypeBool, Offset(shockwaveOnTerrain, ExplosionData) );
-
    addField( "debris", TYPEID< DebrisData >(), Offset(debrisList, ExplosionData), EC_NUM_DEBRIS_TYPES,
       "List of DebrisData objects to spawn with this explosion." );
    addField( "debrisThetaMin", TypeF32, Offset(debrisThetaMin, ExplosionData),

Engine/source/T3D/fx/explosion.h

@@ -41,7 +41,6 @@ class ParticleEmitterData;
 class TSThread;
 class SFXTrack;
 struct DebrisData;
-class ShockwaveData;
 
 //--------------------------------------------------------------------------
 class ExplosionData : public GameBaseData {
@@ -77,10 +76,6 @@ class ExplosionData : public GameBaseData {
    ParticleEmitterData*    emitterList[EC_NUM_EMITTERS];
    S32                     emitterIDList[EC_NUM_EMITTERS];
 
-   ShockwaveData *         shockwave;
-   S32                     shockwaveID;
-   bool                    shockwaveOnTerrain;
-
    DebrisData *   debrisList[EC_NUM_DEBRIS_TYPES];
    S32            debrisIDList[EC_NUM_DEBRIS_TYPES];