From: terencehill <piuntn@gmail.com>
Date: Wed, 5 Aug 2015 21:51:44 +0000 (+0200)
Subject: Hide times of every item, not just armor and MH ones when itemstime is disabled by... 
X-Git-Tag: xonotic-v0.8.1~12^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f4a81dd2f666fa1f2f92a03f3b48f71941454b7;p=xonotic%2Fxonotic-data.pk3dir.git

Hide times of every item, not just armor and MH ones when itemstime is disabled by the server
---

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 8b220661c..d64ba6c83 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -485,6 +485,9 @@ bool Item_ItemsTime_UpdateTime_Check(float item_time, float t)
 }
 void Item_ItemsTime_UpdateTime(entity e, float t)
 {
+	if(!autocvar_sv_itemstime)
+		return;
+
 	if(g_instagib)
 	{
 		switch(e.items)
@@ -508,15 +511,11 @@ void Item_ItemsTime_UpdateTime(entity e, float t)
 		switch(e.items)
 		{
 			case IT_HEALTH:
-				if(!autocvar_sv_itemstime)
-					break;
 				//if (e.classname == "item_health_mega")
 					if(Item_ItemsTime_UpdateTime_Check(it_health_mega_time, t))
 						it_health_mega_time = t;
 				break;
 			case IT_ARMOR:
-				if(!autocvar_sv_itemstime)
-					break;
 				if (e.classname == "item_armor_large")
 					if(Item_ItemsTime_UpdateTime_Check(it_armor_large_time, t))
 						it_armor_large_time = t;
@@ -532,7 +531,7 @@ void Item_ItemsTime_UpdateTime(entity e, float t)
 			default:
 				if(e.weapons & WEPSET_SUPERWEAPONS)
 					if(Item_ItemsTime_UpdateTime_Check(it_superweapons_time, t))
-							it_superweapons_time = t;
+						it_superweapons_time = t;
 		}
 	}
 	switch(e.items)