implement fr changes, add more npc patches

Author: Bitl

src/game/client/weapon_selection.cpp

@@ -401,6 +401,7 @@ void CBaseHudWeaponSelection::UserCmd_Slot10(void)
 }
 
 #ifdef BDSBASE
+#ifdef HL2_CLIENT_DLL
 void ClientInstantPhysSwap()
 {
 	C_BasePlayer* pPlayer = C_BasePlayer::GetLocalPlayer();
@@ -433,6 +434,7 @@ void ClientInstantPhysSwap()
 
 static ConCommand cl_physswap("phys_swap", ClientInstantPhysSwap, "Client-predicted physcannon swap for low-latency switching.");
 #endif
+#endif
 
 //-----------------------------------------------------------------------------
 // Purpose: returns true if the CHudMenu should take slot1, etc commands

src/game/server/hl2/item_ammo.cpp

@@ -12,7 +12,7 @@
 #include "eventlist.h"
 #include "npcevent.h"
 #ifdef BDSBASE
-#include "weapon_hl2mpbasebasebludgeon.h"
+#include "basebludgeonweapon.h"
 #endif
 
 // memdbgon must be the last include file in a .cpp file!!!
@@ -938,7 +938,7 @@ int CItem_AmmoCrate::OnTakeDamage( const CTakeDamageInfo &info )
 		CBaseCombatWeapon* weapon = player->GetActiveWeapon();
 
 #ifdef BDSBASE
-		if (weapon && dynamic_cast<CBaseHL2MPBludgeonWeapon*>(weapon))
+		if (weapon && dynamic_cast<CBaseHLBludgeonWeapon*>(weapon))
 		{
 			if (info.GetDamageType() & DMG_CLUB)
 			{

src/game/server/sound.cpp

@@ -959,7 +959,12 @@ void CAmbientGeneric::SendSound( SoundFlags_t flags)
 			UTIL_EmitAmbientSound( pSoundSource->GetSoundSourceIndex(), pSoundSource->GetAbsOrigin(), m_szSoundFile,
 				(m_dpv.vol * 0.01), m_iSoundLevel, flags, m_dpv.pitch);
 #ifdef BDSBASE
-			m_fActive = true;
+			// Only mark active if this is a looping sound.
+			// If not looping, each trigger will cause the sound to play.
+			// If the sound is still playing from a previous trigger press, 
+			// it will be shut off and then restarted.
+			if (m_fLooping)
+				m_fActive = true;
 #endif
 		}
 	}	

src/game/shared/SoundEmitterSystem.cpp

@@ -314,6 +314,35 @@ class CSoundEmitterSystem : public CBaseGameSystem
 		}
 #endif
 
+#ifdef BDSBASE
+		//load other files with the suffix _override or _custom
+		FileFindHandle_t hFile = FILESYSTEM_INVALID_FIND_HANDLE;
+
+		for (const char* pszFoundFile = g_pFullFileSystem->FindFirst("scripts/*.txt", &hFile); pszFoundFile && hFile != FILESYSTEM_INVALID_FIND_HANDLE; pszFoundFile = g_pFullFileSystem->FindNext(hFile))
+		{
+			char szScriptName[2048];
+			const char* suffix = "_sounds_override";
+
+			if (Q_strncmp(pszFoundFile, suffix, sizeof(suffix)) == 0)
+			{
+				Q_snprintf(szScriptName, sizeof(szScriptName), "scripts/%s", pszFoundFile);
+				soundemitterbase->AddSoundOverrides(szScriptName);
+			}
+			else
+			{
+				suffix = "_sounds_custom";
+
+				if (Q_strncmp(pszFoundFile, suffix, sizeof(suffix)) == 0)
+				{
+					Q_snprintf(szScriptName, sizeof(szScriptName), "scripts/%s", pszFoundFile);
+					soundemitterbase->AddSoundOverrides(szScriptName);
+				}
+			}
+		}
+
+		g_pFullFileSystem->FindClose(hFile);
+#endif
+
 #if !defined( CLIENT_DLL )
 		for ( int i=soundemitterbase->First(); i != soundemitterbase->InvalidIndex(); i=soundemitterbase->Next( i ) )
 		{

src/game/shared/achievements_hlx.cpp

@@ -126,9 +126,15 @@ class CAchievementHLXKillSoldierWithOwnGrenade : public CBaseAchievement
 		{
 			CBaseEntity *pThrower = pGrenade->GetThrower();
 			CBaseEntity *pOriginalThrower = pGrenade->GetOriginalThrower();
-			CBasePlayer *pPlayer = UTIL_GetLocalPlayer();
+#ifndef BDSBASE
+			CBasePlayer* pPlayer = UTIL_GetLocalPlayer();
+#endif //BDSBASE
 			// check if player was most recent thrower, but the victim was the original thrower
-			if ( ( pPlayer == pThrower ) && ( pOriginalThrower == pVictim ) )
+#ifdef BDSBASE
+			if (pThrower->IsPlayer() && (pOriginalThrower == pVictim))
+#else
+			if ((pPlayer == pThrower) && (pOriginalThrower == pVictim))
+#endif //BDSBASE
 			{
 				IncrementCount();
 			}				

src/game/shared/basecombatweapon_shared.cpp

@@ -1037,7 +1037,10 @@ void CBaseCombatWeapon::SetActivity( Activity act, float duration )
 
 	//Adrian: Oh man again...
 #if !defined( CLIENT_DLL ) && (defined( HL2MP ) || defined( PORTAL ))
-	SetModel( GetViewModel() );
+#ifdef BDSBASE
+	if (GetOwner()->IsPlayer())
+#endif //BDSBASE
+		SetModel( GetViewModel() );
 #endif
 
 	if ( sequence != ACTIVITY_NOT_AVAILABLE )