MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-27 22:27:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Peter Covington 2022-04-20 04:05:34 -04:00
parent 31cd394cb7
commit 37019140bd
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sp/src/game/server/mapbase/weapon_custom_hl2.cpp
View File

@ -56,8 +56,8 @@ typedef struct HL2CustomMeleeData_s
float m_flDamage;
float m_flNPCDamage;
float m_flHitDelay;
Activity m_nHitActivity = ACT_INVALID;
byte m_nDamageClass;
bool m_bHitUsesMissAnim;
bool Parse(KeyValues*);
} HL2CustomMeleeData_t;
@ -90,7 +90,7 @@ public:
int GetBackupActivityListCount() { return 0; }
//Functions to select animation sequences
virtual Activity GetPrimaryAttackActivity(void) { return m_CustomData.m_nHitActivity; }
virtual Activity GetPrimaryAttackActivity(void) { return m_CustomData.m_bHitUsesMissAnim ? ACT_VM_MISSCENTER : BaseClass::GetPrimaryAttackActivity(); }
const char* GetWeaponScriptName() { return m_iszWeaponScriptName.Get(); }
virtual int GetDamageType() { return g_nDamageClassTypeBits[m_CustomData.m_nDamageClass]; }
@ -123,15 +123,7 @@ bool HL2CustomMeleeData_s::Parse(KeyValues* pKVWeapon)
m_flMeleeRange = pkvData->GetFloat("range", 70.f);
m_flRefireRate = pkvData->GetFloat("rate", 0.7f);
m_flHitDelay = pkvData->GetFloat("hitdelay");
if (pkvData->FindKey("activity_hit"))
{
m_nHitActivity = (Activity)ActivityList_IndexForName(pkvData->GetString("activity_hit"));
}
if (m_nHitActivity == ACT_INVALID)
{
m_nHitActivity = ACT_VM_HITCENTER;
}
m_bHitUsesMissAnim = pkvData->GetBool("hit_uses_miss_anim");
const char* pszDamageClass = pkvData->GetString("damage_type", nullptr);
if (pszDamageClass)