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

Closes #176

Browse Source
This commit is contained in:
s1lent 2017-11-01 23:32:07 +07:00
parent 875189fa24
commit 026a55eba0
No known key found for this signature in database
GPG Key ID: 0FE401DC73916B5C
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
regamedll/dlls/weapons.cpp
View File

@ -789,11 +789,18 @@ BOOL CanAttack(float attack_time, float curtime, BOOL isPredicted)
bool CBasePlayerWeapon::HasSecondaryAttack()
{
if (m_pPlayer->HasShield())
if (m_pPlayer && m_pPlayer->HasShield())
{
return true;
}
#ifdef REGAMEDLL_API
if (CSPlayerItem()->m_bHasSecondaryAttack)
{
return true;
}
#endif
switch (m_iId)
{
case WEAPON_AK47:
@ -1084,6 +1091,8 @@ void CBasePlayerWeapon::Spawn()
if (GetItemInfo(&info)) {
CSPlayerItem()->SetItemInfo(&info);
}
CSPlayerItem()->m_bHasSecondaryAttack = HasSecondaryAttack();
}
// CALLED THROUGH the newly-touched weapon's instance. The existing player weapon is pOriginal

4
regamedll/public/regamedll/API/CSPlayerItem.h
View File

@ -32,7 +32,8 @@ class CBasePlayerItem;
class CCSPlayerItem: public CCSAnimating
{
public:
CCSPlayerItem()
CCSPlayerItem() :
m_bHasSecondaryAttack(false)
{
Q_memset(&m_ItemInfo, 0, sizeof(m_ItemInfo));
}
@ -43,6 +44,7 @@ public:
public:
ItemInfo m_ItemInfo;
bool m_bHasSecondaryAttack;
};
// Inlines