X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications%2Fall.qh;h=74e313dce000995b724132e09eecf722a4fa4809;hb=ba367013e7ba6c031ba770d352898f4740c7d7c2;hp=481154f3e6ad207fdb4e6d05140273a4d7d0c9cc;hpb=90d9f7c775306324957323d53d5a4ad995d999e3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/notifications/all.qh b/qcsrc/common/notifications/all.qh
index 481154f3e..74e313dce 100644
--- a/qcsrc/common/notifications/all.qh
+++ b/qcsrc/common/notifications/all.qh
@@ -8,10 +8,6 @@
 #include <common/sounds/sound.qh>
 #include <common/weapons/all.qh>
 
-#ifdef CSQC
-#include <client/autocvars.qh>
-#endif
-
 // Operator for bold notifications
 #define BOLD_OPERATOR "^BOLD"
 
@@ -40,6 +36,7 @@ string Get_Notif_TypeName(MSG net_type)
 		case MSG_CENTER: return "MSG_CENTER";
 		case MSG_MULTI: return "MSG_MULTI";
 		case MSG_CHOICE: return "MSG_CHOICE";
+		case MSG_CENTER_KILL: return "MSG_CENTER_KILL";
 	}
 	LOG_WARNF("Get_Notif_TypeName(%d): Improper net type!", ORDINAL(net_type));
 	return "";
@@ -65,8 +62,6 @@ ENUMCLASS(CPID)
 	CASE(CPID, MISSING_TEAMS)
 	CASE(CPID, MISSING_PLAYERS)
 	CASE(CPID, INSTAGIB_FINDAMMO)
-	CASE(CPID, CAMPAIGN_MESSAGE)
-	CASE(CPID, MOTD)
 	CASE(CPID, NIX)
 	CASE(CPID, ONSLAUGHT)
 	CASE(CPID, ONS_CAPSHIELD)
@@ -164,7 +159,9 @@ void Create_Notification_Entity_Choice(entity notif,
 
 void Dump_Notifications(int fh, bool alsoprint);
 
-GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt", false)
+#define DEFAULT_FILENAME "notifications_dump.cfg"
+// NOTE: dumpeffectinfo, dumpnotifs, dumpturrets and dumpweapons use similar code
+GENERIC_COMMAND(dumpnotifs, "Dump all notifications into " DEFAULT_FILENAME, false)
 {
 	switch (request)
 	{
@@ -175,12 +172,12 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt"
 			bool alsoprint = false;
 			if (filename == "")
 			{
-				filename = "notifications_dump.cfg";
+				filename = DEFAULT_FILENAME;
 				alsoprint = false;
 			}
 			else if (filename == "-")
 			{
-				filename = "notifications_dump.cfg";
+				filename = DEFAULT_FILENAME;
 				alsoprint = true;
 			}
 			int fh = fopen(filename, FILE_WRITE);
@@ -195,21 +192,22 @@ GENERIC_COMMAND(dumpnotifs, "Dump all notifications into notifications_dump.txt"
 				LOG_INFOF("^1Error: ^7Could not open file '%s'!", filename);
 			}
 			#else
-			LOG_INFO(_("Notification dump command only works with cl_cmd and sv_cmd."));
+			LOG_INFO("Notification dump command only works with cl_cmd and sv_cmd.");
 			#endif
 			return;
 		}
 		default:
 		case CMD_REQUEST_USAGE:
 		{
-			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [filename]");
-			LOG_HELP("  Where 'filename' is the file to write (default is notifications_dump.cfg),");
+			LOG_HELP("Usage:^3 ", GetProgramCommandPrefix(), " dumpnotifs [<filename>]");
+			LOG_HELPF("  Where <filename> is the file to write (default is %s),", DEFAULT_FILENAME);
 			LOG_HELP("  if supplied with '-' output to console as well as default,");
 			LOG_HELP("  if left blank, it will only write to default.");
 			return;
 		}
 	}
 }
+#undef DEFAULT_FILENAME
 
 #ifdef NOTIFICATIONS_DEBUG
 bool autocvar_notification_debug = false;
@@ -314,7 +312,7 @@ float autocvar_notification_lifetime_mapload = 10;
 #endif
 
 #ifdef SVQC
-void Notification_GetCvars(entity this);
+void Notification_GetCvars(entity this, entity store);
 float autocvar_notification_server_allows_location = 1; // 0 = no, 1 = yes
 #else
 float autocvar_notification_item_centerprinttime = 1.5;
@@ -359,8 +357,8 @@ float autocvar_notification_show_sprees_center_specialonly = true;
 	f1points: point or points depending on f1
 	f1ord: count_ordinal of f1
 	f1time: process_time of f1
-	f1race_time: mmssss of f1
-	f2race_time: mmssss of f2
+	f1race_time: TIME_ENCODED_TOSTRING of f1
+	f2race_time: TIME_ENCODED_TOSTRING of f2
 	race_col: color of race time/position (i.e. good or bad)
 	race_diff: show time difference between f2 and f3
 	missing_teams: show which teams still need players
@@ -419,11 +417,11 @@ string BUFF_NAME(int i);
 	ARG_CASE(ARG_CS,        "f1points",      (f1 == 1 ? _("point") : _("points"))) \
 	ARG_CASE(ARG_CS_SV,     "f1ord",         count_ordinal(f1)) \
 	ARG_CASE(ARG_CS_SV,     "f1time",        process_time(2, f1)) \
-	ARG_CASE(ARG_CS_SV_HA,  "f1race_time",   mmssss(f1)) \
-	ARG_CASE(ARG_CS_SV_HA,  "f2race_time",   mmssss(f2)) \
-	ARG_CASE(ARG_CS_SV_HA,  "f3race_time",   mmssss(f3)) \
+	ARG_CASE(ARG_CS_SV_HA,  "f1race_time",   TIME_ENCODED_TOSTRING(f1, true)) \
+	ARG_CASE(ARG_CS_SV_HA,  "f2race_time",   TIME_ENCODED_TOSTRING(f2, true)) \
+	ARG_CASE(ARG_CS_SV_HA,  "f3race_time",   TIME_ENCODED_TOSTRING(f3, true)) \
 	ARG_CASE(ARG_CS_SV,     "race_col",      CCR(((f1 == 1) ? "^F1" : "^F2"))) \
-	ARG_CASE(ARG_CS_SV,     "race_diff",     ((f2 > f3) ? sprintf(CCR("^1[+%s]"), mmssss(f2 - f3)) : sprintf(CCR("^2[-%s]"), mmssss(f3 - f2)))) \
+	ARG_CASE(ARG_CS_SV,     "race_diff",     ((f2 > f3) ? sprintf(CCR("^1[+%s]"), TIME_ENCODED_TOSTRING(f2 - f3, true)) : sprintf(CCR("^2[-%s]"), TIME_ENCODED_TOSTRING(f3 - f2, true)))) \
 	ARG_CASE(ARG_CS,        "missing_teams", notif_arg_missing_teams(f1)) \
 	ARG_CASE(ARG_CS,        "pass_key",      getcommandkey(_("drop flag"), "+use")) \
 	ARG_CASE(ARG_CS,        "nade_key",      getcommandkey(_("throw nade"), "dropweapon")) \
@@ -634,6 +632,7 @@ string notif_arg_item_wepammo(float f1, float f2)
 {
 	string ammoitems = "";
 	Weapon wep = REGISTRY_GET(Weapons, f1);
+	// TODO: registry handles
 	switch (wep.ammo_type)
 	{
 		case RES_SHELLS:  ammoitems = ITEM_Shells.m_name;      break;