Merge pull request #1652 from John3/cleanup_unused

Cleanup unused functions
This commit is contained in:
Areloch 2016-06-18 11:29:42 -05:00 committed by GitHub
commit f94c59e918
2 changed files with 0 additions and 4 deletions

View file

@ -38,7 +38,6 @@ struct StaticShapeData: public ShapeBaseData {
bool noIndividualDamage; bool noIndividualDamage;
S32 dynamicTypeField; S32 dynamicTypeField;
bool isShielded; bool isShielded;
F32 energyPerDamagePoint;
// //
DECLARE_CONOBJECT(StaticShapeData); DECLARE_CONOBJECT(StaticShapeData);

View file

@ -494,7 +494,6 @@ datablock PlayerData(DefaultPlayerData)
imageAnimPrefixFP = "soldier"; imageAnimPrefixFP = "soldier";
shapeNameFP[0] = "art/shapes/actors/Soldier/FP/FP_SoldierArms.DAE"; shapeNameFP[0] = "art/shapes/actors/Soldier/FP/FP_SoldierArms.DAE";
canObserve = 1;
cmdCategory = "Clients"; cmdCategory = "Clients";
cameraDefaultFov = 55.0; cameraDefaultFov = 55.0;
@ -517,7 +516,6 @@ datablock PlayerData(DefaultPlayerData)
maxDamage = 100; maxDamage = 100;
maxEnergy = 60; maxEnergy = 60;
repairRate = 0.33; repairRate = 0.33;
energyPerDamagePoint = 75;
rechargeRate = 0.256; rechargeRate = 0.256;
@ -650,7 +648,6 @@ datablock PlayerData(DefaultPlayerData)
//exitingWater = ExitingWaterLightSound; //exitingWater = ExitingWaterLightSound;
observeParameters = "0.5 4.5 4.5";
cameraMinDist = "0"; cameraMinDist = "0";
DecalData = "PlayerFootprint"; DecalData = "PlayerFootprint";