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

Fix for citizens not aiming the RPG laser dot correctly

Browse Source
This commit is contained in:
Blixibon 2021-09-18 18:42:56 -05:00
parent 80251f67ec
commit ca80915b54
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sp/src/game/server/hl2/npc_citizen17.cpp
View File

@ -1932,12 +1932,7 @@ void CNPC_Citizen::RunTask( const Task_t *pTask )
return; return;
} }
// Add imprecision to avoid obvious robotic perfection stationary targets // Add imprecision to avoid obvious robotic perfection stationary targets
#ifdef MAPBASE
// More imprecision with low-accuracy citizens
float imprecision = 18*sin(gpGlobals->curtime) + cosh(GetCurrentWeaponProficiency() - 4);
#else
float imprecision = 18*sin(gpGlobals->curtime); float imprecision = 18*sin(gpGlobals->curtime);
#endif
vecLaserPos.x += imprecision; vecLaserPos.x += imprecision;
vecLaserPos.y += imprecision; vecLaserPos.y += imprecision;
vecLaserPos.z += imprecision; vecLaserPos.z += imprecision;
@ -2278,25 +2273,21 @@ bool CNPC_Citizen::IsManhackMeleeCombatant()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
Vector CNPC_Citizen::GetActualShootPosition( const Vector &shootOrigin ) Vector CNPC_Citizen::GetActualShootPosition( const Vector &shootOrigin )
{ {
#ifdef MAPBASE
// The code below is probably broken. If not, it definitely isn't very effective.
return BaseClass::GetActualShootPosition( shootOrigin );
#else
Vector vecTarget = BaseClass::GetActualShootPosition( shootOrigin ); Vector vecTarget = BaseClass::GetActualShootPosition( shootOrigin );
#ifdef MAPBASE #ifdef MAPBASE
// If we're firing an RPG at a gunship, aim off to it's side, because we'll auger towards it. // The gunship RPG code does not appear to be funcitonal, so only set the laser position.
if ( GetActiveWeapon() && EntIsClass(GetActiveWeapon(), gm_isz_class_RPG) && GetEnemy() ) if ( GetActiveWeapon() && EntIsClass(GetActiveWeapon(), gm_isz_class_RPG) && GetEnemy() )
{ {
CWeaponRPG *pRPG = static_cast<CWeaponRPG*>(GetActiveWeapon()); CWeaponRPG *pRPG = static_cast<CWeaponRPG*>(GetActiveWeapon());
if ( EntIsClass( GetEnemy(), gm_isz_class_Gunship ) ) pRPG->SetNPCLaserPosition( vecTarget );
}
#else #else
CWeaponRPG *pRPG = dynamic_cast<CWeaponRPG*>(GetActiveWeapon()); CWeaponRPG *pRPG = dynamic_cast<CWeaponRPG*>(GetActiveWeapon());
// If we're firing an RPG at a gunship, aim off to it's side, because we'll auger towards it. // If we're firing an RPG at a gunship, aim off to it's side, because we'll auger towards it.
if ( pRPG && GetEnemy() ) if ( pRPG && GetEnemy() )
{ {
if ( FClassnameIs( GetEnemy(), "npc_combinegunship" ) ) if ( FClassnameIs( GetEnemy(), "npc_combinegunship" ) )
#endif
{ {
Vector vecRight; Vector vecRight;
GetVectors( NULL, &vecRight, NULL ); GetVectors( NULL, &vecRight, NULL );
@ -2331,11 +2322,10 @@ Vector CNPC_Citizen::GetActualShootPosition( const Vector &shootOrigin )
{ {
pRPG->SetNPCLaserPosition( vecTarget ); pRPG->SetNPCLaserPosition( vecTarget );
} }
} }
#endif
return vecTarget; return vecTarget;
#endif
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------