about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-01-23 17:58:28 +0100
committeroy <Tom_Adams@web.de>2011-01-23 17:58:28 +0100
commit83fc81092f1166587a4265d5bb7b19e24e5a1ba1 (patch)
tree8f5892f0142f1d84ff53205f0998c9df46a598a1 /src
parent53a0f9e78b544f5ad33e3d1d0bfefa107e963afe (diff)
downloadzcatch-83fc81092f1166587a4265d5bb7b19e24e5a1ba1.tar.gz
zcatch-83fc81092f1166587a4265d5bb7b19e24e5a1ba1.zip
fixed position of the hammer damage effect. Closes #448
Diffstat (limited to 'src')
-rw-r--r--src/game/server/entities/character.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index f3bfe793..1221d438 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -302,7 +302,10 @@ void CCharacter::FireWeapon()
 					continue;
 
 				// set his velocity to fast upward (for now)
-				GameServer()->CreateHammerHit(m_Pos);
+				if(length(pTarget->m_Pos-ProjStartPos) > 0.0f)
+					GameServer()->CreateHammerHit(pTarget->m_Pos-normalize(pTarget->m_Pos-ProjStartPos)*m_ProximityRadius*0.5f);
+				else
+					GameServer()->CreateHammerHit(ProjStartPos);
 				
 				vec2 Dir;
 				if (length(pTarget->m_Pos - m_Pos) > 0.0f)