X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications%2Fall.qh;h=7982ee01f73acfc3348bed12334f125d60af494e;hb=8dd5060f4ebfbac94d35cd293621249c7b2157b7;hp=4bd827a6e8fe8f80f8ff6d2ef8142af8ba1964e4;hpb=238d04f302418c0b644c68d45e64eb05b3583f09;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh
index 4bd827a6e..7982ee01f 100644
--- a/qcsrc/common/notifications/all.qh
+++ b/qcsrc/common/notifications/all.qh
@@ -5,6 +5,11 @@
 #include <common/constants.qh>
 #include <common/teams.qh>
 #include <common/util.qh>
+#include <common/sounds/sound.qh>
+
+#ifdef CSQC
+#include <client/autocvars.qh>
+#endif
 
 /** main types/groups of notifications */
 ENUMCLASS(MSG)
@@ -177,25 +182,25 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt"
 			if (fh >= 0)
 			{
 				Dump_Notifications(fh, alsoprint);
-				LOG_INFOF("Dumping notifications... File located in ^2data/data/%s^7.\n", filename);
+				LOG_INFOF("Dumping notifications... File located in ^2data/data/%s^7.", filename);
 				fclose(fh);
 			}
 			else
 			{
-				LOG_INFOF("^1Error: ^7Could not open file '%s'!\n", filename);
+				LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename);
 			}
 			#else
-			LOG_INFO(_("Notification dump command only works with cl_cmd and sv_cmd.\n"));
+			LOG_INFO(_("Notification dump command only works with cl_cmd and sv_cmd."));
 			#endif
 			return;
 		}
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_INFO(strcat("\nUsage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [filename]"));
-			LOG_INFO("  Where 'filename' is the file to write (default is notifications_dump.cfg),\n");
-			LOG_INFO("  if supplied with '-' output to console as well as default,\n");
-			LOG_INFO("  if left blank, it will only write to default.\n");
+			LOG_INFO("Usage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [filename]");
+			LOG_INFO("  Where 'filename' is the file to write (default is notifications_dump.cfg),");
+			LOG_INFO("  if supplied with '-' output to console as well as default,");
+			LOG_INFO("  if left blank, it will only write to default.");
 			return;
 		}
 	}
@@ -402,8 +407,8 @@ string BUFF_NAME(int i);
 	ARG_CASE(ARG_CS_SV_DC,  "f2",            ftos(f2)) \
 	ARG_CASE(ARG_CS_SV,     "f3",            ftos(f3)) \
 	ARG_CASE(ARG_CS_SV,     "f4",            ftos(f4)) \
-	ARG_CASE(ARG_CS_SV,     "f1p2dec",       ftos_decimals(f1/100, 2)) \
-	ARG_CASE(ARG_CS_SV,     "f2p2dec",       ftos_decimals(f2/100, 2)) \
+	ARG_CASE(ARG_CS_SV,     "f1dtime",       ftos_decimals(TIME_DECODE(f1), 2)) \
+	ARG_CASE(ARG_CS_SV,     "f2dtime",       ftos_decimals(TIME_DECODE(f2), 2)) \
 	ARG_CASE(ARG_CS,        "f2primsec",     (f2 ? _("secondary") : _("primary"))) \
 	ARG_CASE(ARG_CS,        "f3primsec",     (f3 ? _("secondary") : _("primary"))) \
 	ARG_CASE(ARG_CS,        "f1secs",        count_seconds(f1)) \
@@ -672,7 +677,8 @@ string notif_arg_spree_inf(float type, string input, string player, float spree)
 
 REGISTRY(Notifications, BITS(11))
 REGISTER_REGISTRY(Notifications)
-REGISTRY_SORT(Notifications); STATIC_INIT(Notifications) { FOREACH(Notifications, true, it.m_id = i); }
+REGISTRY_SORT(Notifications);
+STATIC_INIT(Notifications) { FOREACH(Notifications, true, it.m_id = i); }
 REGISTRY_CHECK(Notifications)
 
 const int NOTIF_CHOICE_MAX = 50;