X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fcommon.qc;h=06615c4eac8575465aed85fe57cbe5181c423940;hb=8f62b609486c7bd6837e453edbbc2934f8e1674a;hp=db712933d0bd4c31359071ceb26c831de5e34104;hpb=28305c2245f99ca5ae21ea8858e05c6bb0a2000b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/weapons/common.qc b/qcsrc/server/weapons/common.qc
index db712933d..06615c4ea 100644
--- a/qcsrc/server/weapons/common.qc
+++ b/qcsrc/server/weapons/common.qc
@@ -1,44 +1,59 @@
 #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 <server/defs.qh>
+#include <server/miscfunctions.qh>
+#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/state.qh>
+#include <common/util.qh>
+#include <common/weapons/_all.qh>
+#include <common/wepent.qh>
+#include <common/items/_mod.qh>
 
-void W_GiveWeapon (entity e, float wep)
-{SELFPARAM();
-
-	if (!wep)
-		return;
+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;
+	}
 
-	e.weapons |= WepSet_FromWeapon(wep);
+	return held_weapons > 1;
+}
 
-	setself(e);
+void W_GiveWeapon(entity e, int wep)
+{
+	if (!wep) return;
 
-	if(IS_PLAYER(other))
-		{ Send_Notification(NOTIF_ONE, other, MSG_MULTI, ITEM_WEAPON_GOT, wep); }
+	STAT(WEAPONS, e) |= WepSet_FromWeapon(Weapons_from(wep));
 
-	setself(this);
+	if (IS_PLAYER(e)) {
+	    Send_Notification(NOTIF_ONE, e, MSG_MULTI, ITEM_WEAPON_GOT, wep);
+    }
 }
 
-void W_PlayStrengthSound(entity player) // void W_PlayStrengthSound
+void W_PlayStrengthSound(entity player)
 {
+	entity store = IS_PLAYER(player) ? PS(player) : player; // because non-player entities can fire, but can they have items? TODO
+
 	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)))
+		&& ((time > store.prevstrengthsound + autocvar_sv_strengthsound_antispam_time) // prevent insane sound spam
+		|| (time > store.prevstrengthsoundattempt + autocvar_sv_strengthsound_antispam_refire_threshold)))
 		{
-			sound(player, CH_TRIGGER, W_Sound("strength_fire"), VOL_BASE, ATTEN_NORM);
-			player.prevstrengthsound = time;
+			sound(player, CH_TRIGGER, SND_STRENGTH_FIRE, VOL_BASE, ATTEN_NORM);
+			store.prevstrengthsound = time;
 		}
-		player.prevstrengthsoundattempt = time;
+		store.prevstrengthsoundattempt = time;
 }
 
 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);
 
@@ -78,19 +93,21 @@ float W_CheckProjectileDamage(entity inflictor, entity projowner, int deathtype,
 	return true; // if none of these return, then allow damage anyway.
 }
 
-void W_PrepareExplosionByDamage(entity attacker, void() explode)
-{SELFPARAM();
-	self.takedamage = DAMAGE_NO;
-	self.event_damage = func_null;
+void W_PrepareExplosionByDamage(entity this, entity attacker, void(entity this) explode)
+{
+	this.takedamage = DAMAGE_NO;
+	this.event_damage = func_null;
+
+	MUTATOR_CALLHOOK(PrepareExplosionByDamage, this, attacker);
 
 	if(IS_CLIENT(attacker) && !autocvar_g_projectiles_keep_owner)
 	{
-		self.owner = attacker;
-		self.realowner = attacker;
+		this.owner = attacker;
+		this.realowner = attacker;
 	}
 
 	// do not explode NOW but in the NEXT FRAME!
 	// because recursive calls to RadiusDamage are not allowed
-	self.nextthink = time;
-	self.think = explode;
+	this.nextthink = time;
+	setthink(this, explode);
 }