From: terencehill <piuntn@gmail.com>
Date: Sun, 25 Aug 2024 15:13:54 +0000 (+0000)
Subject: Merge branch 'terencehill/blaster_attack_shared' into 'master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be66a429a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/blaster_attack_shared' into 'master'

Make weapons using blaster as secondary attack load settings from blaster

See merge request xonotic/xonotic-data.pk3dir!1282
---

be66a429acc7623ecc52436e56c0e1266a0e95f8
diff --cc qcsrc/common/weapons/weapon/electro.qc
index 684fa633e,2a53deb0a..d45810c08
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@@ -53,11 -53,10 +53,11 @@@ void W_Electro_TriggerCombo(vector org
  
  void W_Electro_ExplodeCombo(entity this)
  {
- 	W_Electro_TriggerCombo(this.origin, WEP_CVAR(electro, combo_comboradius), this.realowner);
+ 	W_Electro_TriggerCombo(this.origin, WEP_CVAR(WEP_ELECTRO, combo_comboradius), this.realowner);
  
  	this.event_damage = func_null;
 -	this.velocity = this.movedir; // .velocity must be != '0 0 0' for particle fx and decal to work
 +	if (!this.velocity)
 +		this.velocity = this.movedir; // .velocity must be != '0 0 0' for particle fx and decal to work
  
  	RadiusDamage(
  		this,