X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications.qc;h=1fc3a052147027085ff0db9f5af0efb9203a86a3;hb=902776d303651e49fd84100459abd860f8a50d23;hp=aec2efd2530847a9d8229b2eda4c0676815e8bf0;hpb=5a20b2c2a3e216a18d0fbae3249962850d97bda4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index aec2efd25..1fc3a0521 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -3,6 +3,19 @@
 //  Last updated: February, 2013
 // ================================================
 
+string Get_Notif_TypeName(float net_type)
+{
+	switch(net_type)
+	{
+		case MSG_INFO: return "MSG_INFO";
+		case MSG_CENTER: return "MSG_CENTER";
+		case MSG_WEAPON: return "MSG_WEAPON";
+		case MSG_DEATH: return "MSG_DEATH";
+	}
+	backtrace(sprintf("Get_Notif_TypeName(%d): Improper net type!\n", net_type));
+	return "your ass";
+}
+
 entity Get_Notif_Ent(float net_type, float net_name)
 {
 	switch(net_type)
@@ -16,6 +29,72 @@ entity Get_Notif_Ent(float net_type, float net_name)
 	return world;
 }
 
+string Notification_CheckArgs_TypeName(float net_type, float net_name)
+{
+	// check supplied type and name for errors
+	string checkargs = "";
+	#define CHECKARG_TYPENAME(type) case MSG_##type##: \
+		{ if(!net_name || (net_name > NOTIF_##type##_COUNT)) \
+		{ checkargs = sprintf("Improper name: %d!", net_name); } break; }
+	switch(net_type)
+	{
+		CHECKARG_TYPENAME(INFO)
+		CHECKARG_TYPENAME(CENTER)
+		CHECKARG_TYPENAME(WEAPON)
+		CHECKARG_TYPENAME(DEATH)
+		default: { checkargs = sprintf("Improper type: %d!", checkargs, net_type); break; }
+	}
+	#undef CHECKARG_TYPENAME
+	return checkargs;
+}
+
+#ifdef SVQC
+string Notification_CheckArgs(float broadcast, entity client, float net_type, float net_name)
+{
+	// check supplied broadcast, target, type, and name for errors
+	string checkargs = Notification_CheckArgs_TypeName(net_type, net_name);
+	if(checkargs != "") { checkargs = strcat(checkargs, " "); }
+	switch(broadcast)
+	{
+		case NOTIF_ONE:
+		case NOTIF_ONE_ONLY:
+		{
+			if(IS_NOT_A_CLIENT(client))
+				{ checkargs = sprintf("%sNo client provided!", checkargs); }
+			break;
+		}
+		
+		case NOTIF_ANY_EXCEPT:
+		{
+			if(IS_NOT_A_CLIENT(client))
+				{ checkargs = sprintf("%sException can't be a non-client!", checkargs); }
+			break;
+		}
+		
+		case NOTIF_ANY:
+		{
+			if(client)
+				{ checkargs = sprintf("%sEntity provided when world was required!", checkargs); }
+			break;
+		}
+		
+		case NOTIF_TEAM:
+		case NOTIF_TEAM_EXCEPT:
+		{
+			if not(teamplay) { checkargs = sprintf("%sTeamplay not active!", checkargs); }
+			else if(IS_NOT_A_CLIENT(client))
+			{
+				if(broadcast == NOTIF_TEAM) { checkargs = sprintf("%sNo client provided!", checkargs); }
+				else { checkargs = sprintf("%sException can't be a non-client!", checkargs); }
+			}
+			break;
+		}
+		
+		default: { checkargs = sprintf("%sImproper broadcast: %d!", checkargs, broadcast); break; }
+	}
+	return checkargs;
+}
+#endif
 
 // ===============================
 //  Frontend Notification Pushing
@@ -30,7 +109,7 @@ void Dump_Notifications(float fh, float alsoprint)
 		notif_msg = \
 			sprintf( \
 				"seta notification_%s %d \"notif string: %s^7\"\n", \
-				name, default, strreplace("\{1}", "", strreplace("\n", "\\n", text)) \
+				name, default, strreplace("\{3}", "", strreplace("\n", "\\n", text)) \
 			); \
 		NOTIF_WRITE(notif_msg) }
 
@@ -57,51 +136,62 @@ void Dump_Notifications(float fh, float alsoprint)
 	NOTIF_WRITE("// **                                          ** //\n");
 	NOTIF_WRITE("// ********************************************** //\n");
 
-	NOTIF_WRITE("\n// Version number to identify mismatches between code and config file...\n");
-	NOTIF_WRITE("// Increment NOTIF_VERSION in common/notifications.qh with any\n");
-	NOTIF_WRITE("// new notifications or other changes to notif cvars/this config.\n");
-	
-	NOTIF_WRITE(sprintf("set notification_version %d\n", NOTIF_VERSION));
-
 	// These notifications will also append their string as a comment...
 	// This is not necessary, and does not matter if they vary between config versions,
 	// it is just a semi-helpful tool for those who want to manually change their user settings.
 
 	NOTIF_WRITE(sprintf("\n// MSG_INFO notifications (count = %d):\n", NOTIF_INFO_COUNT));
-	for(i = 1; i <= NOTIF_INFO_COUNT; ++i) {
+	for(i = 1; i <= NOTIF_INFO_COUNT; ++i)
+	{
 		e = Get_Notif_Ent(MSG_INFO, i);
 		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
-		NOTIF_WRITE_SETA(e.nent_name, e.nent_default, e.nent_string); }
+		NOTIF_WRITE_SETA(e.nent_name, e.nent_default, e.nent_string);
+	}
 
 	NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications (count = %d):\n", NOTIF_CENTER_COUNT));
-	for(i = 1; i <= NOTIF_CENTER_COUNT; ++i) {
+	for(i = 1; i <= NOTIF_CENTER_COUNT; ++i)
+	{
 		e = Get_Notif_Ent(MSG_CENTER, i);
 		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
-		NOTIF_WRITE_SETA(e.nent_name, e.nent_default, e.nent_string); }
+		NOTIF_WRITE_SETA(e.nent_name, e.nent_default, e.nent_string);
+	}
 
 	NOTIF_WRITE(sprintf("\n// MSG_WEAPON notifications (count = %d):\n", NOTIF_WEAPON_COUNT));
-	for(i = 1; i <= NOTIF_WEAPON_COUNT; ++i) {
+	for(i = 1; i <= NOTIF_WEAPON_COUNT; ++i)
+	{
 		e = Get_Notif_Ent(MSG_WEAPON, i);
 		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
 		NOTIF_WRITE_SETA(e.nent_name, e.nent_default, sprintf("infoname: %s, centername: %s",
-			e.nent_msginfo.nent_name, e.nent_msgcenter.nent_name)); }
+			e.nent_msginfo.nent_name, e.nent_msgcenter.nent_name));
+	}
 
 	NOTIF_WRITE(sprintf("\n// MSG_DEATH notifications (count = %d):\n", NOTIF_DEATH_COUNT));
-	for(i = 1; i <= NOTIF_DEATH_COUNT; ++i) {
+	for(i = 1; i <= NOTIF_DEATH_COUNT; ++i)
+	{
 		e = Get_Notif_Ent(MSG_DEATH, i);
 		if not(e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
 		NOTIF_WRITE_SETA(e.nent_name, e.nent_default, sprintf("infoname: %s, centername: %s",
-			e.nent_msginfo.nent_name, e.nent_msgcenter.nent_name)); }
+			e.nent_msginfo.nent_name, e.nent_msgcenter.nent_name));
+	}
 
 	// edit these to match whichever cvars are used for specific notification options
 	NOTIF_WRITE("\n// HARD CODED notification variables:\n");
-	NOTIF_WRITE("seta notification_version_mismatch_client_error 0 \"Cause a notif error on client if the version in notifications.cfg mismatches the code\"\n");
-	NOTIF_WRITE("seta notification_version_mismatch_server_error 1 \"Cause a notif error on server if the version in notifications.cfg mismatches the code\"\n");
+	NOTIF_WRITE("seta notification_allow_chatboxprint 1 \"Allow notifications to be printed to chat box by setting notification cvar to 2 (You can also set this cvar to 2 to force ALL notifications to be printed to the chatbox)\"\n");
+	NOTIF_WRITE("seta notification_show_location 0 \"Append location information to MSG_INFO death/kill messages\"\n");
+	NOTIF_WRITE("seta notification_show_location_string \"\" \"Replacement string piped into sprintf, so you can do different messages like this: ' at the %s' or ' (near %s)'\"\n");
+	NOTIF_WRITE("seta notification_show_sprees 1 \"Print information about sprees in death/kill messages\"\n");
+	NOTIF_WRITE("seta notification_show_sprees_center 1 \"Show spree information in MSG_CENTER messages... 0 = off, 1 = target (but only for first victim) and attacker\"\n");
+	NOTIF_WRITE("seta notification_show_sprees_center_specialonly 1 \"Don't show spree information in MSG_CENTER messages if it isn't an achievement\"\n");
+	NOTIF_WRITE("seta notification_show_sprees_info 3 \"Show spree information in MSG_INFO messages... 0 = off, 1 = target only, 2 = attacker only, 3 = target and attacker\"\n");
+	NOTIF_WRITE("seta notification_show_sprees_info_newline 0 \"Show attacker spree information for MSG_INFO messages on a separate line than the death notification itself\"\n");
+	NOTIF_WRITE("seta notification_show_sprees_info_specialonly 1 \"Don't show attacker spree information in MSG_INFO messages if it isn't an achievement\"\n");
 	NOTIF_WRITE("seta notification_errors_are_fatal 1 \"If a notification fails upon initialization, cause a Host_Error to stop the program\"\n");
 	NOTIF_WRITE("seta notification_ctf_pickup_team_verbose 1 \"Show extra information if a team mate picks up a flag\"\n");
 	NOTIF_WRITE("seta notification_ctf_pickup_enemy_verbose 1 \"Show extra information if an enemy picks up a flag\"\n");
 	NOTIF_WRITE("seta notification_ctf_capture_verbose 1 \"Show extra information when someone captures a flag\"\n");
 	NOTIF_WRITE("seta notification_frag_verbose 1 \"Show extra information when you frag someone (or when you are fragged\"\n");
+	NOTIF_WRITE("seta notification_lifetime_runtime 0.5 \"Amount of time that notification entities last on the server during runtime (In seconds)\"\n");
+	NOTIF_WRITE("seta notification_lifetime_mapload 10 \"Amount of time that notification entities last immediately at mapload (in seconds) to help prevent notifications from being lost on early init (like gamestart countdown)\"\n");
 
 	NOTIF_WRITE(sprintf("\n// Notification counts (total = %d): MSG_INFO = %d, MSG_CENTER = %d, MSG_WEAPON = %d, MSG_DEATH = %d\n",
 		(NOTIF_INFO_COUNT + NOTIF_CENTER_COUNT + NOTIF_WEAPON_COUNT + NOTIF_DEATH_COUNT), 
@@ -138,9 +228,7 @@ string Local_Notification_sprintf(string input, string args,
 	float sel_num;
 	for(sel_num = 0; sel_num < NOTIF_MAX_ARGS; ++sel_num) { arg_slot[sel_num] = ""; }
 
-	#ifdef CSQC
 	string tmp_s;
-	#endif
 
 	for(sel_num = 0;(args != "");)
 	{
@@ -150,17 +238,17 @@ string Local_Notification_sprintf(string input, string args,
 		{
 			#define ARG_CASE(prog,selected,result) \
 				#ifdef CSQC \
-					#if (prog == ARG_DOUBLE) || (prog == ARG_TRIPLE) || (prog == ARG_CSQC) \
+					#if (prog != ARG_SV) \
 						case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
 					#endif \
 				#else \
-					#if (prog == ARG_DOUBLE) || (prog == ARG_TRIPLE) || (prog == ARG_SVQC) \
+					#if (prog != ARG_CS) \
 						case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
 					#endif \
 				#endif
 			NOTIF_ARGUMENT_LIST
 			#undef ARG_CASE
-			NOTIF_HIT_UNKNOWN(NOTIF_MAX_ARGS, "Local_Notification_sprintf")
+			default: NOTIF_HIT_UNKNOWN(NOTIF_MAX_ARGS, "Local_Notification_sprintf")
 		}
 	}
 	return sprintf(input, arg_slot[0], arg_slot[1], arg_slot[2], arg_slot[3], arg_slot[4], arg_slot[5], arg_slot[6]);
@@ -180,60 +268,77 @@ void Local_Notification_HUD_Notify_Push(string icon, string hudargs, string s1,
 		switch(strtolower(selected))
 		{
 			#define ARG_CASE(prog,selected,result) \
-				#if (prog == ARG_TRIPLE) \
+				#if (prog == ARG_CS_SV_HA) \
 					case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
 				#endif
 			NOTIF_ARGUMENT_LIST
 			#undef ARG_CASE
-			NOTIF_HIT_UNKNOWN(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push")
+			default: NOTIF_HIT_UNKNOWN(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push")
 		}
 	}
 	HUD_Notify_Push(icon, arg_slot[0], arg_slot[1]);
 }
+
+void Local_Notification_centerprint_generic(string input, string durcnt, float cpid, float f1, float f2)
+{
+	string selected;
+	float sel_num;
+	arg_slot[0] = ""; arg_slot[1] = "";
+
+	for(sel_num = 0;(durcnt != "");)
+	{
+		selected = car(durcnt); durcnt = cdr(durcnt);
+		NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic")
+		switch(strtolower(selected))
+		{
+			#define ARG_CASE(prog,selected,result) \
+				#if (prog == ARG_CS_SV_DC) \
+					case selected: { arg_slot[sel_num] = result; ++sel_num; break; } \
+				#endif
+			NOTIF_ARGUMENT_LIST
+			#undef ARG_CASE
+			default:
+			{
+				if(ftos(stof(selected)) != "") { arg_slot[sel_num] = selected; ++sel_num; }
+				else { NOTIF_HIT_UNKNOWN(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic") }
+				break;
+			}
+		}
+	}
+	centerprint_generic(cpid, input, stof(arg_slot[0]), stof(arg_slot[1]));
+}
 #endif
 
 void Local_Notification(float net_type, float net_name, ...count)
 {
 	// check supplied type and name for errors
-	string checkargs = "";
-	#define CHECKARG_TYPENAME(type) case MSG_##type##: \
-		{ if(!net_name || (net_name > NOTIF_##type##_COUNT)) \
-		{ checkargs = sprintf("Improper name: %d!", net_name); } break; }
-	switch(net_type)
-	{
-		CHECKARG_TYPENAME(INFO)
-		CHECKARG_TYPENAME(CENTER)
-		CHECKARG_TYPENAME(WEAPON)
-		CHECKARG_TYPENAME(DEATH)
-		default: { checkargs = sprintf("Improper type: %d!", checkargs, net_type); break; }
-	}
-	#undef CHECKARG_TYPENAME
+	string checkargs = Notification_CheckArgs_TypeName(net_type, net_name);
 	if(checkargs != "") { backtrace(sprintf("Incorrect usage of Local_Notification: %s\n", checkargs)); return; }
 
 	entity notif = Get_Notif_Ent(net_type, net_name);
 	if not(notif) { backtrace("Local_Notification: Could not find notification entity!\n"); return; }
-	if not(notif.nent_enabled) { print("Local_Notification: Entity was disabled...\n"); return; }
+	if not(notif.nent_enabled) { dprint(sprintf("Local_Notification(%s, %s): Entity was disabled...\n", Get_Notif_TypeName(net_type), notif.nent_name)); return; }
 
 	if((notif.nent_stringcount + notif.nent_floatcount) > count)
 	{
 		backtrace(sprintf(
 			strcat(
-				"Not enough arguments for Local_Notification! ",
+				"Not enough arguments for Local_Notification(%s, %s, ...)! ",
 				"stringcount(%d) + floatcount(%d) > count(%d)\n", 
 				"Check the definition and function call for accuracy...?\n"
 			),
-			notif.nent_stringcount, notif.nent_floatcount, count));
+			Get_Notif_TypeName(net_type), notif.nent_name, notif.nent_stringcount, notif.nent_floatcount, count));
 		return;
 	}
 	else if((notif.nent_stringcount + notif.nent_floatcount) < count)
 	{
 		backtrace(sprintf(
 			strcat(
-				"Too many arguments for Local_Notification! ",
+				"Too many arguments for Local_Notification(%s, %s, ...)! ",
 				"stringcount(%d) + floatcount(%d) < count(%d)\n",
 				"Check the definition and function call for accuracy...?\n"
 			),
-			notif.nent_stringcount, notif.nent_floatcount, count));
+			Get_Notif_TypeName(net_type), notif.nent_name, notif.nent_stringcount, notif.nent_floatcount, count));
 		return;
 	}
 
@@ -248,8 +353,8 @@ void Local_Notification(float net_type, float net_name, ...count)
 
 	#ifdef NOTIFICATIONS_DEBUG
 	dprint(
-		sprintf("Local_Notification(%d, %s, %s, %s);\n",
-			net_type,
+		sprintf("Local_Notification(%s, %s, %s, %s);\n",
+			Get_Notif_TypeName(net_type),
 			notif.nent_name,
 			sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4),
 			sprintf("%d, %d, %d, %d", f1, f2, f3, f4)
@@ -283,14 +388,15 @@ void Local_Notification(float net_type, float net_name, ...count)
 		#ifdef CSQC
 		case MSG_CENTER:
 		{
-			centerprint_generic(
-				notif.nent_cpid,
+			Local_Notification_centerprint_generic(
 				Local_Notification_sprintf(
 					notif.nent_string,
 					notif.nent_args, 
 					s1, s2, s3, s4,
 					f1, f2, f3, f4),
-				0, 0);
+				notif.nent_durcnt,
+				notif.nent_cpid,
+				f1, f2);
 			break;
 		}
 		#endif
@@ -352,30 +458,46 @@ void Read_Notification(float is_new)
 	float net_type = ReadByte();
 	float net_name = ReadShort();
 
-	entity notif = Get_Notif_Ent(net_type, net_name);
-	if not(notif) { print("Read_Notification: Could not find notification entity!\n"); return; }
+	if(net_type == MSG_CENTER_KILL)
+	{
+		if(is_new)
+		{
+			if(net_name == 0) { reset_centerprint_messages(); }
+			else
+			{
+				entity notif = Get_Notif_Ent(MSG_CENTER, net_name);
+				if not(notif) { print("Read_Notification: Could not find notification entity!\n"); return; }
+				centerprint_generic(notif.nent_cpid, "", 0, 0);
+			}
+		}
+	}
+	else
+	{
+		entity notif = Get_Notif_Ent(net_type, net_name);
+		if not(notif) { print("Read_Notification: Could not find notification entity!\n"); return; }
 
-	string s1 = ((0 < notif.nent_stringcount) ? ReadString() : "");
-	string s2 = ((1 < notif.nent_stringcount) ? ReadString() : "");
-	string s3 = ((2 < notif.nent_stringcount) ? ReadString() : "");
-	string s4 = ((3 < notif.nent_stringcount) ? ReadString() : "");
-	float f1 = ((0 < notif.nent_floatcount) ? ReadLong() : 0);
-	float f2 = ((1 < notif.nent_floatcount) ? ReadLong() : 0);
-	float f3 = ((2 < notif.nent_floatcount) ? ReadLong() : 0);
-	float f4 = ((3 < notif.nent_floatcount) ? ReadLong() : 0);
+		#ifdef NOTIFICATIONS_DEBUG
+		dprint(sprintf("Read_Notification(%d) at %f: net_type = %s, net_name = %s\n", is_new, time, Get_Notif_TypeName(net_type), notif.nent_name));
+		#endif
 
-	#ifdef NOTIFICATIONS_DEBUG
-	dprint(sprintf("Read_Notification(%d) at %f: net_name = %s.\n", is_new, time, notif.nent_name));
-	#endif
+		string s1 = ((0 < notif.nent_stringcount) ? ReadString() : "");
+		string s2 = ((1 < notif.nent_stringcount) ? ReadString() : "");
+		string s3 = ((2 < notif.nent_stringcount) ? ReadString() : "");
+		string s4 = ((3 < notif.nent_stringcount) ? ReadString() : "");
+		float f1 = ((0 < notif.nent_floatcount) ? ReadLong() : 0);
+		float f2 = ((1 < notif.nent_floatcount) ? ReadLong() : 0);
+		float f3 = ((2 < notif.nent_floatcount) ? ReadLong() : 0);
+		float f4 = ((3 < notif.nent_floatcount) ? ReadLong() : 0);
 	
-	if(is_new)
-	{
-		Local_Notification_WOVA(
-			net_type, net_name,
-			notif.nent_stringcount,
-			notif.nent_floatcount,
-			s1, s2, s3, s4,
-			f1, f2, f3, f4);
+		if(is_new)
+		{
+			Local_Notification_WOVA(
+				net_type, net_name,
+				notif.nent_stringcount,
+				notif.nent_floatcount,
+				s1, s2, s3, s4,
+				f1, f2, f3, f4);
+		}
 	}
 }
 #endif
@@ -479,62 +601,42 @@ float Net_Write_Notification(entity client, float sf)
 	return send; 
 }
 
-void Send_Notification(float broadcast, entity client,
-	float net_type, float net_name, ...count)
+void Kill_Notification(float broadcast, entity client, float net_type, float net_name)
 {
-	// check supplied broadcast, target, type, and name for errors
-	string checkargs = "";
-	#define CHECKARG_TYPENAME(type) case MSG_##type##: \
-		{ if(!net_name || (net_name > NOTIF_##type##_COUNT)) \
-		{ checkargs = sprintf("Improper name: %d!", net_name); } break; }
-	switch(net_type)
+	string checkargs = Notification_CheckArgs(broadcast, client, net_type, 1);
+	if(checkargs != "") { backtrace(sprintf("Incorrect usage of Kill_Notification: %s\n", checkargs)); return; }
+
+	entity notif;
+
+	// if this is a centerprint, we must tell the client
+	// to kill the cpid in the centerprint queue
+	if(net_type == MSG_CENTER)
 	{
-		CHECKARG_TYPENAME(INFO)
-		CHECKARG_TYPENAME(CENTER)
-		CHECKARG_TYPENAME(WEAPON)
-		CHECKARG_TYPENAME(DEATH)
-		default: { checkargs = sprintf("Improper type: %d!", checkargs, net_type); break; }
+		notif = spawn();
+		notif.classname = "net_kill_notification";
+		notif.nent_broadcast = broadcast;
+		notif.nent_client = client;
+		notif.nent_net_type = MSG_CENTER_KILL;
+		notif.nent_net_name = net_name;
+		Net_LinkEntity(notif, FALSE, autocvar_notification_lifetime_runtime, Net_Write_Notification);
 	}
-	#undef CHECKARG_TYPENAME
-	if(checkargs != "") { checkargs = strcat(checkargs, " "); }
-	switch(broadcast)
+
+	for(notif = world; (notif = find(notif, classname, "net_notification"));)
 	{
-		case NOTIF_ONE:
-		case NOTIF_ONE_ONLY:
+		// now kill the old send notification entity
+		if(notif.nent_net_type == net_type)
 		{
-			if(IS_NOT_A_CLIENT(client))
-				{ checkargs = sprintf("%sNo client provided!", checkargs); }
-			break;
-		}
-		
-		case NOTIF_ANY_EXCEPT:
-		{
-			if(IS_NOT_A_CLIENT(client))
-				{ checkargs = sprintf("%sException can't be a non-client!", checkargs); }
-			break;
+			print(sprintf("killed '%s'\n", notif.classname));
+			notif.think();
 		}
-		
-		case NOTIF_ANY:
-		{
-			if(client)
-				{ checkargs = sprintf("%sEntity provided when world was required!", checkargs); }
-			break;
-		}
-		
-		case NOTIF_TEAM:
-		case NOTIF_TEAM_EXCEPT:
-		{
-			if not(teamplay) { checkargs = sprintf("%sTeamplay not active!", checkargs); }
-			else if(IS_NOT_A_CLIENT(client))
-			{
-				if(broadcast == NOTIF_TEAM) { checkargs = sprintf("%sNo client provided!", checkargs); }
-				else { checkargs = sprintf("%sException can't be a non-client!", checkargs); }
-			}
-			break;
-		}
-		
-		default: { checkargs = sprintf("%sImproper broadcast: %d!", checkargs, broadcast); break; }
 	}
+}
+
+void Send_Notification(float broadcast, entity client,
+	float net_type, float net_name, ...count)
+{
+	// check supplied broadcast, target, type, and name for errors
+	string checkargs = Notification_CheckArgs(broadcast, client, net_type, net_name);
 	if(checkargs != "") { backtrace(sprintf("Incorrect usage of Send_Notification: %s\n", checkargs)); return; }
 
 	// retreive counts for the arguments of this notification
@@ -545,39 +647,48 @@ void Send_Notification(float broadcast, entity client,
 	{
 		backtrace(sprintf(
 			strcat(
-				"Not enough arguments for Send_Notification! ",
+				"Not enough arguments for Send_Notification(%d, %s, %s, ...)! ",
 				"stringcount(%d) + floatcount(%d) > count(%d)\n", 
 				"Check the definition and function call for accuracy...?\n"
 			),
-			notif.nent_stringcount, notif.nent_floatcount, count));
+			broadcast, Get_Notif_TypeName(net_type), notif.nent_name, notif.nent_stringcount, notif.nent_floatcount, count));
 		return;
 	}
 	else if((notif.nent_stringcount + notif.nent_floatcount) < count)
 	{
 		backtrace(sprintf(
 			strcat(
-				"Too many arguments for Send_Notification! ",
+				"Too many arguments for Send_Notification(%d, %s, %s, ...)! ",
 				"stringcount(%d) + floatcount(%d) < count(%d)\n",
 				"Check the definition and function call for accuracy...?\n"
 			),
-			notif.nent_stringcount, notif.nent_floatcount, count));
+			broadcast, Get_Notif_TypeName(net_type), notif.nent_name, notif.nent_stringcount, notif.nent_floatcount, count));
 		return;
 	}
-	
+
 	#ifdef NOTIFICATIONS_DEBUG
+	string s1 = ((0 < notif.nent_stringcount) ? ...(0, string) : "");
+	string s2 = ((1 < notif.nent_stringcount) ? ...(1, string) : "");
+	string s3 = ((2 < notif.nent_stringcount) ? ...(2, string) : "");
+	string s4 = ((3 < notif.nent_stringcount) ? ...(3, string) : "");
+	float f1 = ((0 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 0), float) : 0);
+	float f2 = ((1 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 1), float) : 0);
+	float f3 = ((2 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 2), float) : 0);
+	float f4 = ((3 < notif.nent_floatcount) ? ...((notif.nent_stringcount + 3), float) : 0);
 	dprint(
-		sprintf("Send_Notification(%d, %d, %s, stringcount: %d, floatcount: %d, varargs: %d);\n",
+		sprintf("Send_Notification(%d, %s, %s, %s, %s - %d %d);\n",
 			broadcast,
-			net_type,
+			Get_Notif_TypeName(net_type),
 			notif.nent_name,
-			notif.nent_stringcount,
-			notif.nent_floatcount,
-			count
+			sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4),
+			sprintf("%d, %d, %d, %d", f1, f2, f3, f4),
+			notif.nent_stringcount, notif.nent_floatcount
 		)
 	);
 	#endif
 
 	entity net_notif = spawn();
+	net_notif.classname = "net_notification";
 	net_notif.nent_broadcast = broadcast;
 	net_notif.nent_client = client;
 	net_notif.nent_net_type = net_type;
@@ -588,13 +699,15 @@ void Send_Notification(float broadcast, entity client,
 	float i;
 	for(i = 0; i < net_notif.nent_stringcount; ++i) { net_notif.nent_strings[i] = strzone(...(i, string)); }
 	for(i = 0; i < net_notif.nent_floatcount; ++i) { net_notif.nent_floats[i] = ...((net_notif.nent_stringcount + i), float); }
-	
+
 	net_notif.think = Net_Notification_Remove;
-	net_notif.nextthink = (time + 0.5); 
+	net_notif.nextthink = ((time > autocvar_notification_lifetime_mapload) ?
+			(time + autocvar_notification_lifetime_runtime) :
+			autocvar_notification_lifetime_mapload); 
 
 	Net_LinkEntity(net_notif, FALSE, 0, Net_Write_Notification);
 
-	if((!server_is_local) && (broadcast == NOTIF_ANY || broadcast == NOTIF_ANY_EXCEPT) && (net_type != MSG_CENTER))
+	if(server_is_dedicated && (broadcast == NOTIF_ANY || broadcast == NOTIF_ANY_EXCEPT) && (net_type != MSG_CENTER))
 	{
 		Local_Notification_WOVA(
 			net_type, net_name,
@@ -612,6 +725,20 @@ void Send_Notification_WOVA(float broadcast, entity client,
 	float f1, float f2, float f3, float f4)
 {
 	entity notif = Get_Notif_Ent(net_type, net_name);
+	
+	#ifdef NOTIFICATIONS_DEBUG
+	dprint(
+		sprintf("Send_Notification_WOVA(%d, %s, %s, %s, %s - %d %d);\n",
+			broadcast,
+			Get_Notif_TypeName(net_type),
+			notif.nent_name,
+			sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4),
+			sprintf("%d, %d, %d, %d", f1, f2, f3, f4),
+			notif.nent_stringcount, notif.nent_floatcount
+		)
+	);
+	#endif
+	
 	#define VARITEM(stringc,floatc,args) \
 		if((notif.nent_stringcount == stringc) && (notif.nent_floatcount == floatc)) \
 			{ Send_Notification(broadcast, client, net_type, net_name, args); return; }
@@ -625,8 +752,6 @@ void Send_Notification_WOVA(float broadcast, entity client,
 //  LEGACY NOTIFICATION SYSTEMS
 // =============================
 
-#define Send_CSQC_Centerprint_Generic_Expire(e,id) Send_CSQC_Centerprint_Generic(e, id, "", 1, 0)
-
 void Send_CSQC_Centerprint_Generic(entity e, float id, string s, float duration, float countdown_num)
 {
 	if ((clienttype(e) == CLIENTTYPE_REAL) && (e.flags & FL_CLIENT))