From c60be9a17eb31172a89fb604a36659d93b3c69f5 Mon Sep 17 00:00:00 2001 From: Azaezel Date: Wed, 13 Jan 2016 15:08:21 -0600 Subject: [PATCH] suggested revisions --- Engine/source/T3D/player.cpp | 4 ++-- Engine/source/T3D/player.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp index 32da4703d..21ba1af7a 100644 --- a/Engine/source/T3D/player.cpp +++ b/Engine/source/T3D/player.cpp @@ -6873,7 +6873,7 @@ void Player::playFootstepSound( bool triggeredLeft, Material* contactMaterial, S // Play default sound. S32 sound = -1; - if( contactMaterial && contactMaterial->mFootstepSoundId != -1 ) + if (contactMaterial && (contactMaterial->mImpactSoundId>-1 && contactMaterial->mImpactSoundIdmFootstepSoundId; else if( contactObject && contactObject->getTypeMask() & VehicleObjectType ) sound = 2; @@ -6904,7 +6904,7 @@ void Player:: playImpactSound() else { S32 sound = -1; - if( material && (material->mImpactSoundId>=0) ) + if (material && (material->mImpactSoundId>-1 && material->mImpactSoundIdmImpactSoundId; else if( rInfo.object->getTypeMask() & VehicleObjectType ) sound = 2; // Play metal; diff --git a/Engine/source/T3D/player.h b/Engine/source/T3D/player.h index b2947c4dc..4ffd6c95d 100644 --- a/Engine/source/T3D/player.h +++ b/Engine/source/T3D/player.h @@ -190,6 +190,7 @@ struct PlayerData: public ShapeBaseData { FootHard, FootMetal, FootSnow, + MaxSoundOffsets, FootShallowSplash, FootWading, FootUnderWater,