From 9218ea6768158a8d0fdddb9adf1381803c3aabd8 Mon Sep 17 00:00:00 2001 From: Balgus Date: Thu, 18 Aug 2005 17:43:52 +0000 Subject: [PATCH] git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@330 67975925-1194-0748-b3d5-c16f83f1a3a1 --- main/source/mod/AvHGrenade.cpp | 6 ++++-- main/source/mod/AvHKnife.cpp | 7 ++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/main/source/mod/AvHGrenade.cpp b/main/source/mod/AvHGrenade.cpp index 2e182f48..43cbe5cf 100644 --- a/main/source/mod/AvHGrenade.cpp +++ b/main/source/mod/AvHGrenade.cpp @@ -103,7 +103,9 @@ int AvHGrenade::GetDeployAnimation() const char* AvHGrenade::GetDeploySound() const { - return kGRDeploySound; + //return kGRDeploySound; + return NULL; + } float AvHGrenade::GetDeployTime() const @@ -299,7 +301,7 @@ void AvHGrenade::Precache(void) AvHMarineWeapon::Precache(); PRECACHE_UNMODIFIED_SOUND(kGRFireSound1); - PRECACHE_UNMODIFIED_SOUND(kGRDeploySound); + //PRECACHE_UNMODIFIED_SOUND(kGRDeploySound); PRECACHE_UNMODIFIED_SOUND(kGRExplodeSound); PRECACHE_UNMODIFIED_SOUND(kGRHitSound); diff --git a/main/source/mod/AvHKnife.cpp b/main/source/mod/AvHKnife.cpp index d7b80799..288dac80 100644 --- a/main/source/mod/AvHKnife.cpp +++ b/main/source/mod/AvHKnife.cpp @@ -90,7 +90,9 @@ float AvHKnife::GetDeployTime() const char* AvHKnife::GetDeploySound() const { - return kKNDeploySound; + //return kKNDeploySound; + return NULL; + } char* AvHKnife::GetHeavyViewModel() const @@ -155,6 +157,8 @@ void AvHKnife::FireProjectiles(void) // Do trace hull here float theDamage = this->mDamage; CBaseEntity* pHurt = this->m_pPlayer->CheckTraceHullAttack(kKNRange, theDamage, DMG_SLASH); + + if(pHurt) { char* theSoundToPlay = NULL; @@ -185,6 +189,7 @@ void AvHKnife::FireProjectiles(void) } } + #endif }