From 2bda94f73eba7fd47790f9a18cc03249cb43adb3 Mon Sep 17 00:00:00 2001 From: Teetime Date: Sat, 12 Nov 2011 04:09:53 +0100 Subject: Selfdamage available in Vanilla/AllWeapons-Mode --- src/game/server/entities/character.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 7f37a6af..4e91eb40 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -754,8 +754,8 @@ bool CCharacter::TakeDamage(vec2 Force, int Dmg, int From, int Weapon) bool FromSelf = From == m_pPlayer->GetCID(); if(FromSelf) { - if(Is_zCatch && g_Config.m_SvMode != 1) - Dmg = 0; //No selfdamage, except in vanilla-mode + if(Is_zCatch && g_Config.m_SvMode != 0 && g_Config.m_SvMode != 2) + Dmg = 0; //No selfdamage, except in vanilla and all-weapons-mode // m_pPlayer only inflicts half damage on self else Dmg = max(1, Dmg/2); -- cgit 1.4.1