Merge branch 'terencehill/fuelregen_powerup' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / arc.qc

diff --git a/qcsrc/common/weapons/weapon/arc.qc b/qcsrc/common/weapons/weapon/arc.qc
index 531be194a56af3792c0b816d41e7d9d766cca4b4..1d3ea78a5bf41c0ae8fa091f87aa9467674259ca 100644 (file)
--- a/qcsrc/common/weapons/weapon/arc.qc
+++ b/qcsrc/common/weapons/weapon/arc.qc
@@ -328,6 +328,8 @@ void W_Arc_Beam_Think()
                ||
                IS_DEAD(self.owner)
                ||
+               gameover
+               ||
                (!self.owner.BUTTON_ATCK && !burst )
                ||
                STAT(FROZEN, self.owner)
@@ -865,7 +867,7 @@ void Arc_Smoke()
                }
 #endif
 #ifdef CSQC
-bool autocvar_cl_arcbeam_teamcolor;
+bool autocvar_cl_arcbeam_teamcolor = true;
 
                METHOD(Arc, wr_impacteffect, void(entity thiswep))
                {