diff options
| author | oy <Tom_Adams@web.de> | 2011-01-19 22:41:44 +0100 |
|---|---|---|
| committer | oy <Tom_Adams@web.de> | 2011-01-19 22:41:44 +0100 |
| commit | 17012416369663cdd5bdeead537faede3b8b308d (patch) | |
| tree | b848e1e244438f7cf5542b9c04713bb5ce77ae66 | |
| parent | 9a9c10b1a37ea7b490f208bdd984f5f0a55fbcff (diff) | |
| download | zcatch-17012416369663cdd5bdeead537faede3b8b308d.tar.gz zcatch-17012416369663cdd5bdeead537faede3b8b308d.zip | |
added hammerhit simplification by fisted. Closes #443
| -rw-r--r-- | src/game/server/entities/character.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 53c75e3d..f3bfe793 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -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++; } |