diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2011-11-19 11:13:05 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2011-11-19 11:13:05 +0100 |
| commit | 8197bc22a5cfe77d07cb199b7e2a7f1cdf123fa0 (patch) | |
| tree | 220604ac4204d160f468fc5092a6b62200b9d764 /src | |
| parent | 8d93bb7abdb604ccff48e94eb928f7e923c28fbf (diff) | |
| download | zcatch-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')
| -rw-r--r-- | src/game/server/entities/character.cpp | 6 | ||||
| -rw-r--r-- | src/game/variables.h | 1 |
2 files changed, 4 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*/ diff --git a/src/game/variables.h b/src/game/variables.h index d0204dcf..d2121fe8 100644 --- a/src/game/variables.h +++ b/src/game/variables.h @@ -106,4 +106,5 @@ MACRO_CONFIG_INT(SvAnticamperTime, sv_anticamper_time, 10, 5, 120, CFGFLAG_SERVE MACRO_CONFIG_INT(SvAnticamperRange, sv_anticamper_range, 200, 0, 1000, CFGFLAG_SERVER, "Distance how far away the player must move to escape anticamper") MACRO_CONFIG_INT(SvKickForceReason, sv_kick_force_reason, 1, 0, 1, CFGFLAG_SERVER, "Allow only kickvotes with a reason") +MACRO_CONFIG_INT(SvGrenadeMinDamage, sv_grenade_min_damage, 4, 1, 6, CFGFLAG_SERVER, "How much damage the grenade must do to kill the player (depends how far away it explodes)") #endif |