]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
removed unused check for a damage type in dmg2score
authordrjaska <drjaska83@gmail.com>
Sun, 25 Apr 2021 23:52:48 +0000 (02:52 +0300)
committerdrjaska <drjaska83@gmail.com>
Sun, 25 Apr 2021 23:52:48 +0000 (02:52 +0300)
I thought fire damage was from torches on maps which would burn players
who stand on them, apparently it's from fireball superweapon and napalm
grenades which are used weapons and thus have a registered attacking
player so they'd never pass the check for the source not being a player
thus being unused

qcsrc/common/gamemodes/gamemode/mayhem/sv_mayhem.qc
qcsrc/common/gamemodes/gamemode/tmayhem/sv_tmayhem.qc

index 6863488871d0df9eaf4a8b1f790bc91cd793c25b..07644744f9067ffe8f8801829d15aa47ce0734cc 100644 (file)
@@ -100,7 +100,6 @@ MUTATOR_HOOKFUNCTION(mayhem, PlayerDamage_SplitHealthArmor)
                if (!IS_PLAYER(frag_attacker) && (
                        frag_deathtype == DEATH_DROWN.m_id ||
                        frag_deathtype == DEATH_HURTTRIGGER.m_id ||
-                       frag_deathtype == DEATH_FIRE.m_id ||
                        frag_deathtype == DEATH_CAMP.m_id ||
                        frag_deathtype == DEATH_LAVA.m_id ||
                        frag_deathtype == DEATH_SLIME.m_id))
index 36a4f217097a83193648223d5198acd6ae9d8a33..ec4cf81ac5ff3668be2e4049c3c0f6dd75f48b10 100644 (file)
@@ -158,7 +158,6 @@ MUTATOR_HOOKFUNCTION(tmayhem, PlayerDamage_SplitHealthArmor)
                if (!IS_PLAYER(frag_attacker) && (
                        frag_deathtype == DEATH_DROWN.m_id ||
                        frag_deathtype == DEATH_HURTTRIGGER.m_id ||
-                       frag_deathtype == DEATH_FIRE.m_id ||
                        frag_deathtype == DEATH_CAMP.m_id ||
                        frag_deathtype == DEATH_LAVA.m_id ||
                        frag_deathtype == DEATH_SLIME.m_id))