X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fcommon.qc;h=c4a0daba4aad6f8fc2f24ee24d18cde0a7a648d3;hb=724a41faf2cbfd86d41f3ab59ff8326a831a8326;hp=cf49b54f8b0b169e5702d4e0a010a64af51e6fc5;hpb=12272b26539adfd5dd62c4c59c397ab12b1114be;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index cf49b54f8..c4a0daba4 100644
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,38 +1,36 @@
 #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)
-{
-	entity oldself;
+{SELFPARAM();
 
 	if (!wep)
 		return;
 
-	e.weapons |= WepSet_FromWeapon(wep);
+	e.weapons |= WepSet_FromWeapon(Weapons_from(wep));
 
-	oldself = self;
-	self = e;
+	setself(e);
 
 	if(IS_PLAYER(other))
 		{ Send_Notification(NOTIF_ONE, other, MSG_MULTI, ITEM_WEAPON_GOT, wep); }
 
-	self = oldself;
+	setself(this);
 }
 
 void W_PlayStrengthSound(entity player) // void W_PlayStrengthSound
 {
-	if((player.items & IT_STRENGTH)
+	if((player.items & ITEM_Strength.m_itemid)
 		&& ((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, "weapons/strength_fire.wav", VOL_BASE, ATTEN_NORM);
+			sound(player, CH_TRIGGER, SND_STRENGTH_FIRE, VOL_BASE, ATTEN_NORM);
 			player.prevstrengthsound = time;
 		}
 		player.prevstrengthsoundattempt = time;
@@ -40,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);
 
@@ -81,7 +79,7 @@ float W_CheckProjectileDamage(entity inflictor, entity projowner, int deathtype,
 }
 
 void W_PrepareExplosionByDamage(entity attacker, void() explode)
-{
+{SELFPARAM();
 	self.takedamage = DAMAGE_NO;
 	self.event_damage = func_null;
 
@@ -91,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;