From: Lyberta <lyberta@lyberta.net>
Date: Sat, 3 Jun 2017 17:53:37 +0000 (+0300)
Subject: Survival: Bugfixes.
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b0b3d9a0e7984916449fae7e16f3669fcde677f;p=xonotic%2Fxonotic-data.pk3dir.git

Survival: Bugfixes.
---

diff --git a/qcsrc/server/mutators/mutator/gamemode_survival.qc b/qcsrc/server/mutators/mutator/gamemode_survival.qc
index d8b571e6b..8ec252f11 100644
--- a/qcsrc/server/mutators/mutator/gamemode_survival.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_survival.qc
@@ -962,6 +962,11 @@ void Surv_RoundCleanup()
 		{
 			WaypointSprite_Kill(it.surv_attack_sprite);
 		}
+		if (it.surv_savedplayerstate)
+		{
+			delete(it.surv_savedplayerstate);
+			it.surv_savedplayerstate = NULL;
+		}
 	});
 	if (surv_type == SURVIVAL_TYPE_VERSUS)
 	{
@@ -1791,8 +1796,16 @@ MUTATOR_HOOKFUNCTION(surv, PlayerDamaged)
 	}
 	else
 	{
-		WaypointSprite_UpdateHealth(target.surv_attack_sprite,
-			target.armorvalue + 1);
+		if (autocvar_g_instagib == 1)
+		{
+			WaypointSprite_UpdateHealth(target.surv_attack_sprite,
+				target.armorvalue + 1);
+		}
+		else
+		{
+			WaypointSprite_UpdateHealth(target.surv_attack_sprite,
+				target.health + target.armorvalue);
+		}
 	}
 }