From: Mario Date: Thu, 1 Aug 2024 06:08:03 +0000 (+1000) Subject: Remove now unused dmg_last field from Electro code X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=702f8c2bc66d21e4b87514fc4eb9b090dbe72959;p=xonotic%2Fxonotic-data.pk3dir.git Remove now unused dmg_last field from Electro code --- diff --git a/bal-wep-mario.cfg b/bal-wep-mario.cfg index 2858bde44..83b6a7094 100644 --- a/bal-wep-mario.cfg +++ b/bal-wep-mario.cfg @@ -191,7 +191,7 @@ set g_balance_electro_combo_comboradius_thruwall 200 set g_balance_electro_combo_damage 50 set g_balance_electro_combo_duration 1.5 set g_balance_electro_combo_edgedamage 25 -set g_balance_electro_combo_force 0 +set g_balance_electro_combo_force 120 set g_balance_electro_combo_radius 150 set g_balance_electro_combo_safeammocheck 1 set g_balance_electro_combo_speed 2000 diff --git a/qcsrc/common/weapons/weapon/electro.qc b/qcsrc/common/weapons/weapon/electro.qc index 207149148..d7712eb11 100644 --- a/qcsrc/common/weapons/weapon/electro.qc +++ b/qcsrc/common/weapons/weapon/electro.qc @@ -89,7 +89,6 @@ void W_Electro_ExplodeCombo(entity this) this.dmg_radius = WEP_CVAR(electro, combo_radius); this.dmg_duration = WEP_CVAR(electro, combo_duration); this.teleport_time = time; - this.dmg_last = 1; set_movetype(this, MOVETYPE_NONE); return; } diff --git a/qcsrc/common/weapons/weapon/electro.qh b/qcsrc/common/weapons/weapon/electro.qh index cdb2f10e0..cf117b904 100644 --- a/qcsrc/common/weapons/weapon/electro.qh +++ b/qcsrc/common/weapons/weapon/electro.qh @@ -83,7 +83,6 @@ SPAWNFUNC_WEAPON(weapon_electro, WEP_ELECTRO) .float dmg_edge; .float dmg_radius; .float dmg_duration; -.float dmg_last; IntrusiveList LimitedElectroBallRubbleList; .float electro_count;