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

added hammerhit simplification by fisted. Closes #443

Browse source
This commit is contained in:
oy 2011-01-19 22:41:44 +01:00
parent 9a9c10b1a3
commit 1701241636
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/server/entities/character.cpp
View file

@ -298,13 +298,11 @@ void CCharacter::FireWeapon()
{
CCharacter *pTarget = apEnts[i];
//for race mod or any other mod, which needs hammer hits through the wall remove second condition
if ((pTarget == this) || GameServer()->Collision()->IntersectLine(ProjStartPos, pTarget->m_Pos, NULL, NULL))
continue;
// set his velocity to fast upward (for now)
GameServer()->CreateHammerHit(m_Pos);
pTarget->TakeDamage(vec2(0.f, -1.f), g_pData->m_Weapons.m_Hammer.m_pBase->m_Damage, m_pPlayer->GetCID(), m_ActiveWeapon);
vec2 Dir;
if (length(pTarget->m_Pos - m_Pos) > 0.0f)
@ -312,7 +310,8 @@ void CCharacter::FireWeapon()
else
Dir = vec2(0.f, -1.f);
pTarget->m_Core.m_Vel += normalize(Dir + vec2(0.f, -1.1f)) * 10.0f;
pTarget->TakeDamage(vec2(0.f, -1.f) + normalize(Dir + vec2(0.f, -1.1f)) * 10.0f, g_pData->m_Weapons.m_Hammer.m_pBase->m_Damage,
m_pPlayer->GetCID(), m_ActiveWeapon);
Hits++;
}