FWGS
/
hlsdk-xash3d
mirror of https://github.com/FWGS/hlsdk-xash3d
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'opfor' into opforfixed

This commit is contained in:
Andrey Akhmichin 2022-12-04 03:35:44 +05:00
parent b51cf6ef3b e785ec1582
commit 6cfc082738
No known key found for this signature in database
GPG Key ID: 1F180D249B0643C0
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
dlls/gearbox/voltigore.cpp
View File

@ -1226,6 +1226,8 @@ public:
Schedule_t* GetSchedule();
Schedule_t* GetScheduleOfType(int Type);
CBaseEntity *CheckTraceHullAttack( float flDist, int iDamage, int iDmgType );
virtual int SizeForGrapple() { return GRAPPLE_SMALL; }
};
@ -1274,7 +1276,7 @@ void CBabyVoltigore::HandleAnimEvent(MonsterEvent_t* pEvent)
case VOLTIGORE_AE_PUNCH_SINGLE:
{
CBaseEntity *pHurt = CheckTraceHullAttack(70, gSkillData.babyVoltigoreDmgPunch, DMG_CLUB | DMG_ALWAYSGIB);
CBaseEntity *pHurt = CheckTraceHullAttack(64, gSkillData.babyVoltigoreDmgPunch, DMG_CLUB );
if (pHurt)
{
if (FBitSet(pHurt->pev->flags, FL_MONSTER|FL_CLIENT))
@ -1300,7 +1302,7 @@ void CBabyVoltigore::HandleAnimEvent(MonsterEvent_t* pEvent)
case VOLTIGORE_AE_PUNCH_BOTH:
{
CBaseEntity *pHurt = CheckTraceHullAttack(70, gSkillData.babyVoltigoreDmgPunch, DMG_CLUB | DMG_ALWAYSGIB);
CBaseEntity *pHurt = CheckTraceHullAttack(64, gSkillData.babyVoltigoreDmgPunch, DMG_CLUB );
if (pHurt)
{
if (FBitSet(pHurt->pev->flags, FL_MONSTER|FL_CLIENT))
@ -1404,6 +1406,8 @@ Schedule_t *CBabyVoltigore::GetSchedule(void)
break;
}
default:
break;
}
return CBaseMonster::GetSchedule();
@ -1422,3 +1426,30 @@ Schedule_t *CBabyVoltigore::GetScheduleOfType(int Type)
break;
}
}
CBaseEntity *CBabyVoltigore::CheckTraceHullAttack( float flDist, int iDamage, int iDmgType )
{
TraceResult tr;
UTIL_MakeAimVectors( pev->angles );
Vector vecStart = pev->origin;
vecStart.z += pev->size.z;
Vector vecEnd = vecStart + ( gpGlobals->v_forward * flDist );
UTIL_TraceHull( vecStart, vecEnd, dont_ignore_monsters, head_hull, ENT( pev ), &tr );
if( tr.pHit )
{
CBaseEntity *pEntity = CBaseEntity::Instance( tr.pHit );
if( iDamage > 0 )
{
pEntity->TakeDamage( pev, pev, iDamage, iDmgType );
}
return pEntity;
}
return NULL;
}