From f8a4e7dbab5960090c33f858af621351d0dc71a7 Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Sat, 31 Aug 2024 19:16:26 +0800 Subject: [PATCH] Call TakeDamage on projectile and laser hit (gun, shotgun and laser) The grenade and hammer already triggered TakeDamage now all weapons hitting a tee call the method again --- src/game/server/entities/laser.cpp | 1 + src/game/server/entities/projectile.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp index 6c393c5b7..ba15d94f5 100644 --- a/src/game/server/entities/laser.cpp +++ b/src/game/server/entities/laser.cpp @@ -94,6 +94,7 @@ bool CLaser::HitCharacter(vec2 From, vec2 To) { pHit->UnFreeze(); } + pHit->TakeDamage(vec2(0, 0), 0, m_Owner, m_Type); return true; } diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp index 9579b0170..c2bdac75f 100644 --- a/src/game/server/entities/projectile.cpp +++ b/src/game/server/entities/projectile.cpp @@ -177,6 +177,8 @@ void CProjectile::Tick() pChr->Freeze(); } } + else if(pTargetChr) + pTargetChr->TakeDamage(vec2(0, 0), 0, m_Owner, m_Type); if(pOwnerChar && !GameLayerClipped(ColPos) && ((m_Type == WEAPON_GRENADE && pOwnerChar->HasTelegunGrenade()) || (m_Type == WEAPON_GUN && pOwnerChar->HasTelegunGun())))