From: Samual Lenks <samual@xonotic.org>
Date: Wed, 27 Feb 2013 07:05:54 +0000 (-0500)
Subject: Only the client needs this cvar
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~86
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42b37fb8606248393a90d463b2a8d8fd016dd1cb;p=xonotic%2Fxonotic-data.pk3dir.git

Only the client needs this cvar
---

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 5653a6d9a..9260b5b18 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -238,11 +238,11 @@ string Local_Notification_sprintf(string input, string args,
 		{
 			#define ARG_CASE(prog,selected,result) \
 				#ifdef CSQC \
-					#if (prog != ARG_SV) \
+					#if (prog != ARG_SV) && (prog != ARG_DC) \
 						case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
 					#endif \
 				#else \
-					#if (prog != ARG_CS) \
+					#if (prog != ARG_CS) && (prog != ARG_DC) \
 						case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
 					#endif \
 				#endif
diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 8a2695159..07b93c2b1 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -565,7 +565,6 @@ var float autocvar_notification_show_sprees = TRUE;
 var float autocvar_notification_show_sprees_info = 3; // 0 = off, 1 = target only, 2 = attacker only, 3 = target and attacker
 var float autocvar_notification_show_sprees_info_newline = FALSE;
 var float autocvar_notification_show_sprees_info_specialonly = TRUE;
-var float autocvar_notification_item_centerprinttime = 1.5;
 var float autocvar_notification_errors_are_fatal = TRUE;
 var float autocvar_notification_lifetime_runtime = 0.5;
 var float autocvar_notification_lifetime_mapload = 10;
@@ -574,6 +573,7 @@ var float autocvar_notification_lifetime_mapload = 10;
 .float FRAG_VERBOSE;
 void Notification_GetCvars(void);
 #else
+var float autocvar_notification_item_centerprinttime = 1.5;
 var float autocvar_notification_allow_chatboxprint = 1; // 0 = no, 1 = yes, 2 = forced on for all MSG_INFO notifs
 var float autocvar_notification_show_sprees_center = TRUE;
 var float autocvar_notification_show_sprees_center_specialonly = TRUE;