From: terencehill <piuntn@gmail.com>
Date: Tue, 20 Nov 2012 23:18:59 +0000 (+0100)
Subject: Fix health regeneration starting when player is frozen, more easily noticeable settin... 
X-Git-Tag: xonotic-v0.7.0~61^2~113
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=623f24b2b5e8269ff371bc41fe7939f979dac5e7;p=xonotic%2Fxonotic-data.pk3dir.git

Fix health regeneration starting when player is frozen, more easily noticeable setting g_balance_pause_health_regen to 1 instead of the default value 5
---

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 95c8790c3..97ab68546 100644
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -360,6 +360,8 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
 	float n;
 	vector revive_extra_size;
 
+	if(self.freezetag_frozen && !self.freezetag_revive_progress)
+		self.health = 1;
 	if(next_round || (time > warmup - autocvar_g_freezetag_warmup && time < warmup))
 		return 1; // already waiting for next round to start
 
diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 1f1137e4b..08841f571 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -104,8 +104,9 @@ void minstagib_ammocheck(void)
 		minstagib_stop_countdown(self);
 	else if (self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO))
 	{
+		if (self.minstagib_needammo)
+			self.health = 100;
 		minstagib_stop_countdown(self);
-		self.health = 100;
 	}
 	else
 	{