]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/weapons/common.qc
Makefile: use `-I.`
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / common.qc
index 5a5e30bf79c11c92cd217c5e006bf0d399a92c73..c4a0daba4aad6f8fc2f24ee24d18cde0a7a648d3 100644 (file)
@@ -1,12 +1,12 @@
 #include "common.qh"
 
-#include "../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"
+#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);
 
@@ -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;