From: Mario <mario@smbclan.net>
Date: Mon, 1 Oct 2018 12:20:28 +0000 (+1000)
Subject: Fix electro combos
X-Git-Tag: xonotic-v0.8.5~1796
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3c3e749b957f526846ed8011a91cd1e7fb9568c;p=xonotic%2Fxonotic-data.pk3dir.git

Fix electro combos
---

diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc
index cff7122c0..259fef6d5 100644
--- a/qcsrc/common/weapons/weapon/electro.qc
+++ b/qcsrc/common/weapons/weapon/electro.qc
@@ -64,7 +64,7 @@ void W_Electro_ExplodeCombo(entity this)
 		NULL,
 		NULL,
 		WEP_CVAR(electro, combo_force),
-		this.projectiledeathtype | HITTYPE_BOUNCE, // use THIS type for a combo because primary can't bounce
+		WEP_ELECTRO.m_id | HITTYPE_BOUNCE, // use THIS type for a combo because primary can't bounce
 		this.weaponentity_fld,
 		NULL
 	);
@@ -394,14 +394,6 @@ void W_Electro_Attack_Orb(Weapon thiswep, entity actor, .entity weaponentity)
 	proj.bouncestop = WEP_CVAR_SEC(electro, bouncestop);
 	proj.missile_flags = MIF_SPLASH | MIF_ARC;
 
-#if 0
-	entity p2;
-	p2 = spawn();
-	copyentity(proj, p2);
-	setmodel(p2, MDL_PROJECTILE_ELECTRO);
-	setsize(p2, proj.mins, proj.maxs);
-#endif
-
 	CSQCProjectile(proj, true, PROJECTILE_ELECTRO, false); // no culling, it has sound
 
 	MUTATOR_CALLHOOK(EditProjectile, actor, proj);