X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fcommon.qc;h=3592e3f7e14b3086a46b0d029f00f96e728f56ad;hb=4eab3f0253a063bdbd4e1ff64c4b2b08077c44c4;hp=b94b2533f3441a1e5955a13f54214b142e94a398;hpb=b283d314c0c619a12b54c6094ade99ed69daed67;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index b94b2533f..3592e3f7e 100644
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -2,7 +2,7 @@
 
 #include <server/defs.qh>
 #include <server/miscfunctions.qh>
-#include <common/t_items.qh>
+#include <common/items.qh>
 #include <common/constants.qh>
 #include <common/net_linked.qh>
 #include <common/deathtypes/all.qh>
@@ -10,13 +10,27 @@
 #include <common/state.qh>
 #include <common/util.qh>
 #include <common/weapons/_all.qh>
+#include <common/wepent.qh>
 #include <common/items/_mod.qh>
 
+bool W_DualWielding(entity player)
+{
+	int held_weapons = 0;
+	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		if(player.(weaponentity) && player.(weaponentity).m_switchweapon != WEP_Null)
+			++held_weapons;
+	}
+
+	return held_weapons > 1;
+}
+
 void W_GiveWeapon(entity e, int wep)
 {
 	if (!wep) return;
 
-	e.weapons |= WepSet_FromWeapon(Weapons_from(wep));
+	STAT(WEAPONS, e) |= WepSet_FromWeapon(REGISTRY_GET(Weapons, wep));
 
 	if (IS_PLAYER(e)) {
 	    Send_Notification(NOTIF_ONE, e, MSG_MULTI, ITEM_WEAPON_GOT, wep);
@@ -84,14 +98,14 @@ void W_PrepareExplosionByDamage(entity this, entity attacker, void(entity this)
 	this.takedamage = DAMAGE_NO;
 	this.event_damage = func_null;
 
+	MUTATOR_CALLHOOK(PrepareExplosionByDamage, this, attacker);
+
 	if(IS_CLIENT(attacker) && !autocvar_g_projectiles_keep_owner)
 	{
 		this.owner = attacker;
 		this.realowner = attacker;
 	}
 
-	MUTATOR_CALLHOOK(PrepareExplosionByDamage, this, attacker);
-
 	// do not explode NOW but in the NEXT FRAME!
 	// because recursive calls to RadiusDamage are not allowed
 	this.nextthink = time;