xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added hitmarker

Browse source
This commit is contained in:
Kamay Xutax 2024-09-11 08:54:40 +02:00
parent 67ed5669c0
commit 52b452c60b
2 changed files with 58 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
game/client/cstrike/c_cs_player.cpp
View file

@ -9,10 +9,12 @@
#include "c_cs_player.h"
#include "c_user_message_register.h"
#include "cdll_client_int.h"
#include "cdll_util.h"
#include "convar.h"
#include "datacache/imdlcache.h"
#include "dbg.h"
#include "dt_recv.h"
#include "hud_basechat.h"
#include "iconvar.h"
#include "interpolatedvar.h"
#include "mathlib/vector.h"
@ -70,6 +72,8 @@
#include "iviewrender_beams.h" // flashlight beam
#include "cs_hud_chat.h"
//=============================================================================
// HPE_BEGIN:
// [menglish] Adding and externing variables needed for the freezecam
@ -766,6 +770,7 @@ C_CSPlayer::C_CSPlayer() :
ListenForGameEvent( "bullet_hit_player" );
ListenForGameEvent( "bullet_player_hitboxes" );
ListenForGameEvent( "player_lag_hitboxes" );
ListenForGameEvent( "player_hurt" );
m_bIsInsideLagCompensationContext = false;
}
@ -2109,6 +2114,7 @@ void C_CSPlayer::FireEvent( const Vector& origin, const QAngle& angles, int even
}
ConVar cl_debug_duration( "cl_debug_duration", "60" );
ConVar cl_enable_hitmarks( "cl_enable_hitmarks", "1" );
void C_CSPlayer::FireGameEvent( IGameEvent* event )
{
@ -2497,6 +2503,57 @@ void C_CSPlayer::FireGameEvent( IGameEvent* event )
{
ShowEventHitboxes( cl_debug_duration.GetFloat() );
}
else if ( cl_enable_hitmarks.GetBool() && FStrEq( event->GetName(), "player_hurt" ) )
{
const int index = event->GetInt( "attacker" );
if ( index == GetUserID() && IsLocalPlayer() )
{
const auto playerUserID = event->GetInt( "userid" );
const auto player = ( C_CSPlayer* )UTIL_PlayerByUserId( playerUserID );
if ( player && !player->IsLocalPlayer() )
{
auto health_damages = event->GetInt( "dmg_health" );
auto armor_damages = event->GetInt( "dmg_armor" );
auto hitgroup = event->GetInt( "hitgroup" );
CLocalPlayerFilter filter;
EmitSound( filter, GetSoundSourceIndex(), "Player.Hitmark" );
CHudChat* hudChat = ( CHudChat* )GET_HUDELEMENT( CHudChat );
if ( hudChat )
{
char buffer_armor[256];
if ( armor_damages > 0 )
{
V_sprintf_safe( buffer_armor,
" and \x7"
"FF0000%i \x7"
"FFFFFFarmor.",
armor_damages );
}
else
{
buffer_armor[0] = '.';
buffer_armor[1] = 0;
}
hudChat->Printf( CHAT_FILTER_NONE,
"\7FFFFFFYou hit \x7"
"FF00FF%s\x7"
"FFFFFF with: \x7"
"FF0000%i \x7"
"FFFFFFhealth%s",
player->GetPlayerName(),
health_damages,
buffer_armor );
}
}
}
}
}
void C_CSPlayer::SetActivity( Activity eActivity )

2
gamedata

@ -1 +1 @@
Subproject commit 4f281876e11e69fc48372dddbec47c1201bdbb09
Subproject commit ad7fda715ea07924ff55faa9aed17b4d3bc7ddf4