From: Mario <mario.mario@y7mail.com>
Date: Tue, 23 Apr 2013 07:35:26 +0000 (+1000)
Subject: Unfreze player before disconnecting/spectating
X-Git-Tag: xonotic-v0.8.0~241^2^2~294
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=28116a7097306059094066c33179964683e03bdf;p=xonotic%2Fxonotic-data.pk3dir.git

Unfreze player before disconnecting/spectating
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c5304cbce..f8ba5e16c 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -391,6 +391,8 @@ void PutObserverInServer (void)
 
 	Portal_ClearAll(self);
 	
+	Unfreeze(self);
+	
 	if(self.alivetime)
 	{
 		if(!inWarmupStage)
@@ -1623,6 +1625,8 @@ void ClientDisconnect (void)
 	MUTATOR_CALLHOOK(ClientDisconnect);
 
 	Portal_ClearAll(self);
+	
+	Unfreeze(self);
 
 	RemoveGrapplingHook(self);
 
diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index e8505868b..4806da595 100644
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -321,7 +321,7 @@ void shalrath_heal()
 		{
 			if(IS_PLAYER(head))
 			{
-				if(head.ammo_cells < start_ammo_cells || head.health < g_pickup_healthmedium_max)
+				if((g_minstagib && head.ammo_cells < start_ammo_cells) || head.health < g_pickup_healthmedium_max)
 					pointparticles(particleeffectnum(((g_minstagib) ? "ammoregen_fx" : "healing_fx")), head.origin, '0 0 0', 1);
 				if(g_minstagib)
 					head.ammo_cells = bound(0, head.ammo_cells + 1, start_ammo_cells);