diff options
| author | Teetime <teetimetw@yahoo.de> | 2011-11-12 04:09:53 +0100 |
|---|---|---|
| committer | Teetime <teetimetw@yahoo.de> | 2011-11-12 04:09:53 +0100 |
| commit | 2bda94f73eba7fd47790f9a18cc03249cb43adb3 (patch) | |
| tree | 22b15e36581cc7dfca06bf3881e742d8061d7eb7 /src/game/server/entities/character.cpp | |
| parent | 9fde691e091ebb0178b7e2d65d2d8c9f81214e99 (diff) | |
| download | zcatch-2bda94f73eba7fd47790f9a18cc03249cb43adb3.tar.gz zcatch-2bda94f73eba7fd47790f9a18cc03249cb43adb3.zip | |
Selfdamage available in Vanilla/AllWeapons-Mode
Diffstat (limited to 'src/game/server/entities/character.cpp')
| -rw-r--r-- | src/game/server/entities/character.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |