edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix2

Browse source
This commit is contained in:
def 2018-04-04 20:41:05 +02:00
parent 03ee53eaf1
commit 6d3b8f2d36
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/server/entities/projectile.cpp
View file

@ -137,7 +137,6 @@ void CProjectile::Tick()
) )
{ {
IsWeaponCollide = true; IsWeaponCollide = true;
//TeamMask = OwnerChar->Teams()->TeamMask( OwnerChar->Team());
} }
if (pOwnerChar && pOwnerChar->IsAlive()) if (pOwnerChar && pOwnerChar->IsAlive())
{ {

8
src/game/server/gamecontext.cpp
View file

@ -171,6 +171,7 @@ void CGameContext::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamag
float Radius = 135.0f; float Radius = 135.0f;
float InnerRadius = 48.0f; float InnerRadius = 48.0f;
int Num = m_World.FindEntities(Pos, Radius, (CEntity**)apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER); int Num = m_World.FindEntities(Pos, Radius, (CEntity**)apEnts, MAX_CLIENTS, CGameWorld::ENTTYPE_CHARACTER);
int64_t TeamMask = -1;
for(int i = 0; i < Num; i++) for(int i = 0; i < Num; i++)
{ {
vec2 Diff = apEnts[i]->m_Pos - Pos; vec2 Diff = apEnts[i]->m_Pos - Pos;
@ -195,8 +196,11 @@ void CGameContext::CreateExplosion(vec2 Pos, int Owner, int Weapon, bool NoDamag
// Explode at most once per team // Explode at most once per team
int PlayerTeam = ((CGameControllerDDRace*)m_pController)->m_Teams.m_Core.Team(apEnts[i]->GetPlayer()->GetCID()); int PlayerTeam = ((CGameControllerDDRace*)m_pController)->m_Teams.m_Core.Team(apEnts[i]->GetPlayer()->GetCID());
if(!CmaskIsSet(Mask, PlayerTeam)) continue; if(GetPlayerChar(Owner) ? GetPlayerChar(Owner)->m_Hit&CCharacter::DISABLE_HIT_GRENADE : !g_Config.m_SvHit || NoDamage)
Mask = CmaskUnset(Mask, PlayerTeam); {
if(!CmaskIsSet(TeamMask, PlayerTeam)) continue;
TeamMask = CmaskUnset(TeamMask, PlayerTeam);
}
apEnts[i]->TakeDamage(ForceDir*Dmg*2, (int)Dmg, Owner, Weapon); apEnts[i]->TakeDamage(ForceDir*Dmg*2, (int)Dmg, Owner, Weapon);
} }