Mirrors/halflife2chaos
1
0
Fork 0
mirror of https://github.com/Pinsplash/halflife2chaos.git synced 2024-10-29 23:32:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed NPCs aiming too high and rare sprite crash

Browse Source
This commit is contained in:
Pinsplash 2024-10-03 16:12:41 -05:00
parent f4f2fe8dfd
commit 1c21efa51f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sp/src/game/client/spritemodel.cpp
View File

@ -417,6 +417,8 @@ IMaterial *CEngineSprite::GetMaterial( RenderMode_t nRenderMode, int nFrame )
IMaterial *pMaterial = m_material[nRenderMode];
if (!pMaterial)//here because of an HLS issue, but good to have regardless
return NULL;
IMaterialVar* pFrameVar = pMaterial->FindVarFast( "$frame", &frameCache );
if ( pFrameVar )
{

18
sp/src/game/server/ai_basenpc.cpp
View File

@ -9524,9 +9524,8 @@ Vector CAI_BaseNPC::GetShootEnemyDir( const Vector &shootOrigin, bool bNoisy )
if ( pEnemy )
{
Vector vecEnemyLKP = GetEnemyLKP();
Vector vecEnemyOffset = pEnemy->BodyTarget( bNoisy ) - pEnemy->GetAbsOrigin();
//Vector vecEnemyLKP = GetEnemyLKP();
//Vector vecEnemyOffset = pEnemy->BodyTarget(bNoisy) -pEnemy->GetAbsOrigin();
#ifdef PORTAL
// Translate the enemy's position across the portals if it's only seen in the portal view cone
@ -9541,7 +9540,8 @@ Vector CAI_BaseNPC::GetShootEnemyDir( const Vector &shootOrigin, bool bNoisy )
}
#endif
Vector retval = vecEnemyOffset + vecEnemyLKP - shootOrigin;
//PIN: NPCs were aiming above targets after bodytarget changes
Vector retval = pEnemy->BodyTarget(bNoisy) - shootOrigin;
VectorNormalize( retval );
return retval;
}
@ -9606,10 +9606,14 @@ void CAI_BaseNPC::CollectShotStats( const Vector &vecShootOrigin, const Vector &
//-----------------------------------------------------------------------------
Vector CAI_BaseNPC::GetActualShootPosition( const Vector &shootOrigin )
{
//PIN: Changed this code. removed the 1st 2 vectors and made the last one simply call bodytarget because what was here before seemed like nonsense.
// Project the target's location into the future.
Vector vecEnemyLKP = GetEnemyLKP();
Vector vecEnemyOffset = GetEnemy()->BodyTarget(true) - GetEnemy()->GetAbsOrigin();
Vector vecTargetPosition = vecEnemyOffset + vecEnemyLKP;
//Vector vecEnemyLKP = GetEnemyLKP();
//NDebugOverlay::Cross3D(vecEnemyLKP, 16, 255, 0, 0, true, 3);
//Vector vecEnemyOffset = GetEnemy()->BodyTarget(true) - GetEnemy()->GetAbsOrigin();
//NDebugOverlay::Cross3D(vecEnemyOffset, 16, 0, 255, 0, true, 3);
Vector vecTargetPosition = GetEnemy()->BodyTarget(true);
//NDebugOverlay::Cross3D(vecTargetPosition, 16, 0, 0, 255, true, 3);
#ifdef PORTAL
// Check if it's also visible through portals