Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/game/client/c_spatialentity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "cbase.h"

#include "c_spatialentity.h"
#include "c_asw_player.h"
#include "c_asw_inhabitable_npc.h"

// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"
Expand Down Expand Up @@ -64,17 +66,17 @@ void C_SpatialEntity::ClientThink()
return;
}

CBaseEntity *pPlayer = C_BasePlayer::GetLocalPlayer( 0 );
if( !pPlayer )
C_ASW_Inhabitable_NPC* pViewNPC = C_ASW_Player::GetLocalASWPlayer()->GetViewNPC();

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we have a static function that does this? I'm a little bit worried about a potential crash from the local player being null for some reason.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my thoughts were it will probably crash all over different places in that case too

if( !pViewNPC )
return;

Vector playerOrigin = pPlayer->GetAbsOrigin();
Vector viewNPCOrigin = pViewNPC->GetAbsOrigin();

m_flWeight = 0.0f;

if ( ( m_minFalloff != -1 ) && ( m_maxFalloff != -1 ) && m_minFalloff != m_maxFalloff )
{
float dist = (playerOrigin - m_vecOrigin).Length();
float dist = (viewNPCOrigin - m_vecOrigin).Length();
m_flWeight = (dist-m_minFalloff) / (m_maxFalloff-m_minFalloff);
m_flWeight = fpmax( 0.0f, m_flWeight );
m_flWeight = fpmin( 1.0f, m_flWeight );
Expand Down
Loading