From: Mario <mario.mario@y7mail.com>
Date: Thu, 23 Jun 2022 13:39:39 +0000 (+1000)
Subject: Add the combined damage of all shots to the HLAC shot setup calculations
X-Git-Tag: xonotic-v0.8.6~435^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6411a86b7a90e28527ce219c13e2d37c527f2ed6;p=xonotic%2Fxonotic-data.pk3dir.git

Add the combined damage of all shots to the HLAC shot setup calculations
---

diff --git a/qcsrc/common/weapons/weapon/hlac.qc b/qcsrc/common/weapons/weapon/hlac.qc
index f2c6cf9b3..d89cdb128 100644
--- a/qcsrc/common/weapons/weapon/hlac.qc
+++ b/qcsrc/common/weapons/weapon/hlac.qc
@@ -76,7 +76,7 @@ void W_HLAC_Attack2(Weapon thiswep, entity actor, .entity weaponentity)
 	if(IS_DUCKED(actor))
 		spread = spread * WEP_CVAR_SEC(hlac, spread_crouchmod);
 
-	W_SetupShot(actor, weaponentity, false, 3, SND_LASERGUN_FIRE, CH_WEAPON_A, WEP_CVAR_SEC(hlac, damage), thiswep.m_id | HITTYPE_SECONDARY);
+	W_SetupShot(actor, weaponentity, false, 3, SND_LASERGUN_FIRE, CH_WEAPON_A, WEP_CVAR_SEC(hlac, damage) * WEP_CVAR_SEC(hlac, shots), thiswep.m_id | HITTYPE_SECONDARY);
 	W_MuzzleFlash(thiswep, actor, weaponentity, w_shotorg, w_shotdir);
 	W_DecreaseAmmo(thiswep, actor, WEP_CVAR_SEC(hlac, ammo), weaponentity);