From: Samual Lenks <samual@xonotic.org>
Date: Wed, 27 Feb 2013 08:14:09 +0000 (-0500)
Subject: Fix some things
X-Git-Tag: xonotic-v0.7.0~62^2~23^2~82
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f683d012135f050c3bd609eb3d78033e7a5977b;p=xonotic%2Fxonotic-data.pk3dir.git

Fix some things
---

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index d596d2225..4504a6004 100644
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -569,17 +569,17 @@ var float autocvar_notification_errors_are_fatal = TRUE;
 var float autocvar_notification_lifetime_runtime = 0.5;
 var float autocvar_notification_lifetime_mapload = 10;
 
-#ifdef SVQC
-.float FRAG_VERBOSE;
-void Notification_GetCvars(void);
-#else
+// used only by CSQC, but needs to be added for dumpnotifs command anyway
 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;
 var float autocvar_notification_frag_verbose = TRUE;
-#endif
 
+#ifdef SVQC
+.float FRAG_VERBOSE;
+void Notification_GetCvars(void);
+#endif
 
 // ============================
 //  Notification Argument List
@@ -647,7 +647,7 @@ string arg_slot[NOTIF_MAX_ARGS];
 	ARG_CASE(ARG_CS_SV, 		"f2p2dec", 			ftos_decimals(f2/100, 2)) \
 	ARG_CASE(ARG_CS, 			"f1secs",			count_seconds(f1)) \
 	ARG_CASE(ARG_CS_SV,			"f1ord",			count_ordinal(f1)) \
-	ARG_CASE(ARG_CS,			"f1time",			process_time("foobar", f1)) \
+	ARG_CASE(ARG_CS,			"f1time",			process_time("todo", f1)) \
 	ARG_CASE(ARG_CS, 			"pass_key", 		((((tmp_s = getcommandkey("pass", "+use")) != "pass") && !(strstrofs(tmp_s, "not bound", 0) >= 0)) ? sprintf(CCR(_(" ^F1(Press %s)")), tmp_s) : "")) \
 	ARG_CASE(ARG_CS, 			"frag_ping", 		((f2 != NO_MSG) ? sprintf(CCR(_("\n(Ping ^2%d^BG)")), f2) : "")) \
 	ARG_CASE(ARG_CS, 			"frag_stats", 		sprintf(CCR(_("\n(Health ^1%d^BG / Armor ^2%d^BG)%s")), f2, f3, ((f4 != NO_MSG) ? sprintf(CCR(_(" (Ping ^2%d^BG)")), f4) : ""))) \
@@ -658,7 +658,7 @@ string arg_slot[NOTIF_MAX_ARGS];
 	ARG_CASE(ARG_CS_SV, 		"spree_lost", 		(autocvar_notification_show_sprees ? notif_arg_spree_inf(-2, "", "", f1) : "")) \
 	ARG_CASE(ARG_CS_SV, 		"item_wepname", 	W_Name(f1)) \
 	ARG_CASE(ARG_CS_SV,			"item_wepammo", 	(s1 != "" ? s1 : "")) \
-	ARG_CASE(ARG_DC,		"item_centime", 	ftos(autocvar_notification_item_centerprinttime)) \
+	ARG_CASE(ARG_DC,			"item_centime", 	ftos(autocvar_notification_item_centerprinttime)) \
 	ARG_CASE(ARG_SV, 			"death_team", 		Team_ColoredFullName(f1)) \
 	ARG_CASE(ARG_CS, 			"death_team", 		Team_ColoredFullName(f1 - 1)) \
 	ARG_CASE(ARG_CS_SV,			"race_time",		mmssss(f2)) \