From: Mario Date: Tue, 4 Apr 2017 21:27:27 +0000 (+1000) Subject: Merge branch 'master' into Mario/custom_monster X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e6acfe089ca264bf4a24d7e0bc8faba614b304e;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into Mario/custom_monster --- 7e6acfe089ca264bf4a24d7e0bc8faba614b304e diff --cc qcsrc/common/monsters/sv_monsters.qc index aabec01d7,246c1bef4..fdd30169c --- a/qcsrc/common/monsters/sv_monsters.qc +++ b/qcsrc/common/monsters/sv_monsters.qc @@@ -1086,10 -1079,9 +1086,10 @@@ void Monster_Damage(entity this, entit this.dmg_time = time; if(deathtype != DEATH_DROWN.m_id && deathtype != DEATH_FIRE.m_id && sound_allowed(MSG_BROADCAST, attacker)) - spamsound (this, CH_PAIN, SND(BODYIMPACT1), VOL_BASE, ATTEN_NORM); // FIXME: PLACEHOLDER + spamsound (this, CH_PAIN, SND_BODYIMPACT1, VOL_BASE, ATTEN_NORM); // FIXME: PLACEHOLDER - this.velocity += force * this.damageforcescale; + if(this.damageforcescale > 0) + this.velocity += force * this.damageforcescale; if(deathtype != DEATH_DROWN.m_id && take) {