about summary refs log tree commit diff
path: root/src/game/server/entities
diff options
context:
space:
mode:
authorTeetime <TeetimeTW@yahoo.de>2011-11-19 11:13:05 +0100
committerTeetime <TeetimeTW@yahoo.de>2011-11-19 11:13:05 +0100
commit8197bc22a5cfe77d07cb199b7e2a7f1cdf123fa0 (patch)
tree220604ac4204d160f468fc5092a6b62200b9d764 /src/game/server/entities
parent8d93bb7abdb604ccff48e94eb928f7e923c28fbf (diff)
downloadzcatch-8197bc22a5cfe77d07cb199b7e2a7f1cdf123fa0.tar.gz
zcatch-8197bc22a5cfe77d07cb199b7e2a7f1cdf123fa0.zip
new option to set how much damage is needed to kill a player by grenade
Diffstat (limited to 'src/game/server/entities')
-rw-r--r--src/game/server/entities/character.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index f4a43c08..676339b2 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -771,6 +771,9 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
 		else
 			Dmg = max(1, Dmg/2);
 	}
+
+	if(g_Config.m_SvMode == 4 && Weapon == WEAPON_GRENADE && Dmg < g_Config.m_SvGrenadeMinDamage)
+		Dmg = 0;
 	/* end zCatch */
 	
 	m_DamageTaken++;
@@ -795,9 +798,6 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon)
 		{
 			m_Health = 0;
 			m_Armor = 0;
-			char aBuf[8];
-			str_format(aBuf, sizeof(aBuf), "%d", Dmg);
-			GameServer()->SendChatTarget(-1, aBuf);
 		}
 		/* end zCatch*/