From 0c10ba68334cdd87378e879faf6551c46db49dc7 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Fri, 27 Feb 2015 20:24:47 -0600 Subject: [PATCH] removal of un-implemented ShockwaveData entries from explosion. --- Engine/source/T3D/fx/explosion.cpp | 7 ------- Engine/source/T3D/fx/explosion.h | 5 ----- 2 files changed, 12 deletions(-) diff --git a/Engine/source/T3D/fx/explosion.cpp b/Engine/source/T3D/fx/explosion.cpp index 462c0d38a..e4daaf077 100644 --- a/Engine/source/T3D/fx/explosion.cpp +++ b/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), diff --git a/Engine/source/T3D/fx/explosion.h b/Engine/source/T3D/fx/explosion.h index 7fe0406d4..19e91ad4e 100644 --- a/Engine/source/T3D/fx/explosion.h +++ b/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];