From: Mario <mario.mario@y7mail.com>
Date: Sun, 13 Oct 2013 00:42:20 +0000 (+1100)
Subject: Disable health regeneration in invasion mode
X-Git-Tag: xonotic-v0.8.0~241^2^2~37
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96ab51f2e3b5cde9acb78886d3e6ace8e0910230;p=xonotic%2Fxonotic-data.pk3dir.git

Disable health regeneration in invasion mode
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e39bbb672..1c94d3650 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1609,10 +1609,10 @@ void player_regen (void)
 	limita = limita * limit_mod;
 	//limitf = limitf * limit_mod;
 
-	if(g_ca)
+	if(g_ca || g_invasion)
 		rot_mod = 0;
 
-	if (!g_minstagib && !g_ca && (!g_lms || autocvar_g_lms_regenerate))
+	if (!g_minstagib && !g_ca && !g_invasion && (!g_lms || autocvar_g_lms_regenerate))
 	{
 		self.armorvalue = CalcRotRegen(self.armorvalue, mina, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, regen_mod * frametime * (time > self.pauseregen_finished), maxa, autocvar_g_balance_armor_rot, autocvar_g_balance_armor_rotlinear, rot_mod * frametime * (time > self.pauserotarmor_finished), limita);
 		self.health = CalcRotRegen(self.health, minh, autocvar_g_balance_health_regen, autocvar_g_balance_health_regenlinear, regen_mod * frametime * (time > self.pauseregen_finished), maxh, autocvar_g_balance_health_rot, autocvar_g_balance_health_rotlinear, rot_mod * frametime * (time > self.pauserothealth_finished), limith);