X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fweaponsystem.qc;h=c0d302e2232123e9e3c049eed1965f27d750cf7b;hp=2a6cd03a4daec752658f6f92d6107b4ea3bdd3ab;hb=b0a563c3658ec620ddb9037b9417b743a47002a5;hpb=268f9c69576b6bb929f66d19f0d077d19ba47edd

diff --git a/qcsrc/server/weapons/weaponsystem.qc b/qcsrc/server/weapons/weaponsystem.qc
index 2a6cd03a4d..c0d302e223 100644
--- a/qcsrc/server/weapons/weaponsystem.qc
+++ b/qcsrc/server/weapons/weaponsystem.qc
@@ -8,6 +8,7 @@
 #include <common/t_items.qh>
 #include <common/animdecide.qh>
 #include <common/constants.qh>
+#include <common/net_linked.qh>
 #include <common/monsters/_mod.qh>
 #include <common/notifications/all.qh>
 #include <common/util.qh>
@@ -21,7 +22,9 @@
 
 float W_WeaponRateFactor(entity this)
 {
-	float t = 1.0 / g_weaponratefactor;
+	float t = 1;
+	if(g_weaponratefactor > 0)
+		t = 1.0 / g_weaponratefactor;
 
 	MUTATOR_CALLHOOK(WeaponRateFactor, t, this);
 	t = M_ARGV(0, float);
@@ -150,7 +153,7 @@ void CL_ExteriorWeaponentity_Think(entity this)
 	else this.alpha = 1;
 
     Weapon wep = PS(this.owner).m_weapon;
-	if (wep) this.glowmod = weaponentity_glowmod(wep, this.owner.clientcolors);
+	if (wep) this.glowmod = weaponentity_glowmod(wep, this.owner, this.owner.clientcolors);
 	this.colormap = this.owner.colormap;
 
 	CSQCMODEL_AUTOUPDATE(this);