Makefile: use `-I.`

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

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index db712933d0bd4c31359071ceb26c831de5e34104..c4a0daba4aad6f8fc2f24ee24d18cde0a7a648d3 100644 (file)
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,12 +1,12 @@
 #include "common.qh"
-#include "../_all.qh"
 
-#include "../t_items.qh"
-#include "../../common/constants.qh"
-#include "../../common/deathtypes.qh"
-#include "../../common/notifications.qh"
-#include "../../common/util.qh"
-#include "../../common/weapons/all.qh"
+#include <common/t_items.qh>
+#include <common/constants.qh>
+#include <common/deathtypes/all.qh>
+#include <common/notifications.qh>
+#include <common/util.qh>
+#include <common/weapons/all.qh>
+#include <common/items/all.qc>
 
 void W_GiveWeapon (entity e, float wep)
 {SELFPARAM();
@@ -14,7 +14,7 @@ void W_GiveWeapon (entity e, float wep)
        if (!wep)
                return;
 
-       e.weapons |= WepSet_FromWeapon(wep);
+       e.weapons |= WepSet_FromWeapon(Weapons_from(wep));
 
        setself(e);
 
@@ -30,7 +30,7 @@ void W_PlayStrengthSound(entity player) // void W_PlayStrengthSound
                && ((time > player.prevstrengthsound + autocvar_sv_strengthsound_antispam_time) // prevent insane sound spam
                || (time > player.prevstrengthsoundattempt + autocvar_sv_strengthsound_antispam_refire_threshold)))
                {
-                       sound(player, CH_TRIGGER, W_Sound("strength_fire"), VOL_BASE, ATTEN_NORM);
+                       sound(player, CH_TRIGGER, SND_STRENGTH_FIRE, VOL_BASE, ATTEN_NORM);
                        player.prevstrengthsound = time;
                }
                player.prevstrengthsoundattempt = time;
@@ -38,7 +38,7 @@ void W_PlayStrengthSound(entity player) // void W_PlayStrengthSound
 
 float W_CheckProjectileDamage(entity inflictor, entity projowner, int deathtype, float exception)
 {
-       float is_from_contents = (deathtype == DEATH_SLIME || deathtype == DEATH_LAVA);
+       float is_from_contents = (deathtype == DEATH_SLIME.m_id || deathtype == DEATH_LAVA.m_id);
        float is_from_owner = (inflictor == projowner);
        float is_from_exception = (exception != -1);
 
@@ -89,6 +89,8 @@ void W_PrepareExplosionByDamage(entity attacker, void() explode)
                self.realowner = attacker;
        }
 
+       MUTATOR_CALLHOOK(PrepareExplosionByDamage, self, attacker);
+
        // do not explode NOW but in the NEXT FRAME!
        // because recursive calls to RadiusDamage are not allowed
        self.nextthink = time;