]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: be37d17 b6b68fa)
Merge branch 'master' into Mario/custom_monster Mario/custom_monster
authorMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:27:27 +0000 (07:27 +1000)
committerMario <mario@smbclan.net>
Tue, 4 Apr 2017 21:27:27 +0000 (07:27 +1000)
1  2 
qcsrc/common/monsters/sv_monsters.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/monsters/sv_monsters.qc
index aabec01d739c95af9a1ddacf86331ec62f55f84f,246c1bef4e9c4070eb1194b0dae112e2ad5ef52f..fdd30169ce1d06998a056a39f61cf0604da6ce85
--- 1/qcsrc/common/monsters/sv_monsters.qc
--- 2/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)
        {
diff --cc qcsrc/server/client.qc
Simple merge