Skip to content
Open
Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions src/game/client/hl2mp/c_hl2mp_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,15 @@ void C_HL2MP_Player::TraceAttack( const CTakeDamageInfo &info, const Vector &vec

int blood = BloodColor();

#ifndef NEO
CBaseEntity *pAttacker = info.GetAttacker();

if ( pAttacker )
{
if ( HL2MPRules()->IsTeamplay() && pAttacker->InSameTeam( this ) == true )
return;
}
#endif // NEO

if ( blood != DONT_BLEED )
{
Expand Down
2 changes: 2 additions & 0 deletions src/game/shared/baseentity_shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1654,9 +1654,11 @@ void CBaseEntity::FireBullets( const FireBulletsInfo_t &info )

bool bDoServerEffects = true;

#ifndef NEO
#if defined( HL2MP ) && defined( GAME_DLL )
bDoServerEffects = false;
#endif
#endif // NEO

#if defined( GAME_DLL )
if( IsPlayer() )
Expand Down