reHLDS/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2025-01-14 15:48:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix hitsounds on vehicles (#491)

Browse Source
This commit is contained in:
Juice 2020-01-14 11:01:00 +03:00 committed by Dmitry Novikov
parent e1b62d2495
commit 8c723a635c
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
regamedll/dlls/sound.cpp
View File

@ -1631,7 +1631,11 @@ float TEXTURETYPE_PlaySound(TraceResult *ptr, Vector vecSrc, Vector vecEnd, int
chTextureType = '\0'; chTextureType = '\0';
#ifdef REGAMEDLL_FIXES
if (pEntity && pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE && pEntity->Classify() != CLASS_VEHICLE)
#else
if (pEntity && pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE) if (pEntity && pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE)
#endif
{ {
// hit body // hit body
chTextureType = CHAR_TEX_FLESH; chTextureType = CHAR_TEX_FLESH;

4
regamedll/dlls/util.cpp
View File

@ -1568,7 +1568,11 @@ char UTIL_TextureHit(TraceResult *ptr, Vector vecSrc, Vector vecEnd)
char szbuffer[64]; char szbuffer[64];
CBaseEntity *pEntity = CBaseEntity::Instance(ptr->pHit); CBaseEntity *pEntity = CBaseEntity::Instance(ptr->pHit);
#ifdef REGAMEDLL_FIXES
if (pEntity && pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE && pEntity->Classify() != CLASS_VEHICLE)
#else
if (pEntity && pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE) if (pEntity && pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE)
#endif
return CHAR_TEX_FLESH; return CHAR_TEX_FLESH;
vecSrc.CopyToArray(rgfl1); vecSrc.CopyToArray(rgfl1);

8
regamedll/dlls/wpn_shared/wpn_knife.cpp
View File

@ -365,7 +365,11 @@ BOOL CKnife::Swing(BOOL fFirst)
if (pEntity) // -V595 if (pEntity) // -V595
#endif #endif
{ {
#ifdef REGAMEDLL_FIXES
if (pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE && pEntity->Classify() != CLASS_VEHICLE)
#else
if (pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE) if (pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE)
#endif
{ {
// play thwack or smack sound // play thwack or smack sound
switch (RANDOM_LONG(0, 3)) switch (RANDOM_LONG(0, 3))
@ -531,7 +535,11 @@ BOOL CKnife::Stab(BOOL fFirst)
if (pEntity) // -V595 if (pEntity) // -V595
#endif #endif
{ {
#ifdef REGAMEDLL_FIXES
if (pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE && pEntity->Classify() != CLASS_VEHICLE)
#else
if (pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE) if (pEntity->Classify() != CLASS_NONE && pEntity->Classify() != CLASS_MACHINE)
#endif
{ {
EMIT_SOUND(m_pPlayer->edict(), CHAN_WEAPON, "weapons/knife_stab.wav", VOL_NORM, ATTN_NORM); EMIT_SOUND(m_pPlayer->edict(), CHAN_WEAPON, "weapons/knife_stab.wav", VOL_NORM, ATTN_NORM);
m_pPlayer->m_iWeaponVolume = KNIFE_BODYHIT_VOLUME; m_pPlayer->m_iWeaponVolume = KNIFE_BODYHIT_VOLUME;