Merge branch 'master' into Mirio/balance

[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 4a06e16661027b650be469a327af68badd70b93d..6d163755067def2224a973db9bc311f1dcb60770 100644 (file)
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -2,11 +2,12 @@
 
 #include <common/t_items.qh>
 #include <common/constants.qh>
+#include <common/net_linked.qh>
 #include <common/deathtypes/all.qh>
 #include <common/notifications/all.qh>
 #include <common/util.qh>
-#include <common/weapons/all.qh>
-#include <common/items/all.qc>
+#include <common/weapons/_all.qh>
+#include <common/items/_mod.qh>
 
 void W_GiveWeapon(entity e, int wep)
 {
@@ -73,7 +74,7 @@ float W_CheckProjectileDamage(entity inflictor, entity projowner, int deathtype,
        return true; // if none of these return, then allow damage anyway.
 }
 
-void W_PrepareExplosionByDamage(entity this, entity attacker, void() explode)
+void W_PrepareExplosionByDamage(entity this, entity attacker, void(entity this) explode)
 {
        this.takedamage = DAMAGE_NO;
        this.event_damage = func_null;
@@ -89,5 +90,5 @@ void W_PrepareExplosionByDamage(entity this, entity attacker, void() explode)
        // do not explode NOW but in the NEXT FRAME!
        // because recursive calls to RadiusDamage are not allowed
        this.nextthink = time;
-       this.think = explode;
+       setthink(this, explode);
 }