Merge branch 'master' into mirceakitsune/damage_effects

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index fe4df352fb5a2fc1c6cfd565d8985f72d05bf6d8..2e3296fbaf335e4526af59eedd9fde26c8cf717d 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -527,6 +527,10 @@ entity damage_attacker;
 
 void Damage (entity targ, entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
 {
+       // if the target is a player or dead body, activate damage effects
+       if(targ.classname == "player" || targ.classname == "body")
+               Violence_DamageEffect(targ, damage, DEATH_WEAPONOF(deathtype));
+
        float mirrordamage;
        float mirrorforce;
        float teamdamage0;
@@ -629,6 +633,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                        {
                                                                vector v;
                                                                v = healtharmor_applydamage(attacker.armorvalue, autocvar_g_balance_armor_blockpercent, mirrordamage);
+                                                               v_z = 0; // fteqcc sucks
                                                                attacker.dmg_take += v_x;
                                                                attacker.dmg_save += v_y;
                                                                attacker.dmg_inflictor = inflictor;
@@ -640,12 +645,13 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                                                        {
                                                                vector v;
                                                                v = healtharmor_applydamage(targ.armorvalue, autocvar_g_balance_armor_blockpercent, damage);
+                                                               v_z = 0; // fteqcc sucks
                                                                targ.dmg_take += v_x;
                                                                targ.dmg_save += v_y;
                                                                targ.dmg_inflictor = inflictor;
                                                                damage = 0;
-                                if(!autocvar_g_friendlyfire_virtual_force)
-                                    force = '0 0 0';
+                                                               if(!autocvar_g_friendlyfire_virtual_force)
+                                                                       force = '0 0 0';
                                                        }
                                                }
                                                else