X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications.qc;h=230b74834dfa65a7e90bbbb6c86af5df1e8e88e8;hb=eff92d4aee25ebe31fe768af2b86c8bea80d1a51;hp=8c297513e72e4f97ac85a42ffa24a5043498ea93;hpb=387861a0bee1121b0869bfaf8cff5b703ffc1ad2;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 8c297513e..230b74834 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -1,9 +1,24 @@
+#if defined(CSQC)
+#elif defined(MENUQC)
+#elif defined(SVQC)
+	#include "../dpdefs/progsdefs.qh"
+    #include "../dpdefs/dpextensions.qh"
+    #include "constants.qh"
+    #include "teams.qh"
+    #include "counting.qh"
+    #include "../server/autocvars.qh"
+    #include "../server/constants.qh"
+    #include "../server/defs.qh"
+    #include "notifications.qh"
+    #include "../server/mutators/mutators_include.qh"
+#endif
+
 // ================================================
 //  Unified notification system, written by Samual
 //  Last updated: August, 2013
 // ================================================
 
-string Get_Notif_TypeName(float net_type)
+string Get_Notif_TypeName(int net_type)
 {
 	switch(net_type)
 	{
@@ -18,7 +33,7 @@ string Get_Notif_TypeName(float net_type)
 	return "";
 }
 
-entity Get_Notif_Ent(float net_type, float net_name)
+entity Get_Notif_Ent(int net_type, int net_name)
 {
 	switch(net_type)
 	{
@@ -139,12 +154,12 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
 					&&
 					(to_client.enemy == other_client)
 				)
-			) { return TRUE; }
+			) { return true; }
 			break;
 		}
 		case NOTIF_ONE_ONLY: // send ONLY to one client
 		{
-			if(to_client == other_client) { return TRUE; }
+			if(to_client == other_client) { return true; }
 			break;
 		}
 		case NOTIF_TEAM: // send only to X team and their spectators
@@ -157,7 +172,7 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
 					&&
 					(to_client.enemy.team == other_client.team)
 				)
-			) { return TRUE; }
+			) { return true; }
 			break;
 		}
 		case NOTIF_TEAM_EXCEPT: // send only to X team and their spectators, except for Y person and their spectators
@@ -178,12 +193,12 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
 						)
 					)
 				)
-			) { return TRUE; }
+			) { return true; }
 			break;
 		}
 		case NOTIF_ALL: // send to everyone
 		{
-			return TRUE;
+			return true;
 		}
 		case NOTIF_ALL_EXCEPT: // send to everyone except X person and their spectators
 		{
@@ -195,11 +210,11 @@ float Notification_ShouldSend(float broadcast, entity to_client, entity other_cl
 					&&
 					(to_client.enemy == other_client)
 				)
-			) { return TRUE; }
+			) { return true; }
 			break;
 		}
 	}
-	return FALSE;
+	return false;
 }
 
 #endif
@@ -224,15 +239,16 @@ void Destroy_Notification_Entity(entity notif)
 void Destroy_All_Notifications(void)
 {
 	entity notif;
-	float i;
+	int i;
 
-	#define DESTROY_LOOP(type,count) \
+	#define DESTROY_LOOP(type,count) do { \
 		for(i = 1; i <= count; ++i) \
 		{ \
 			notif = Get_Notif_Ent(type, i); \
 			if (!notif) { backtrace("Destroy_All_Notifications(): Missing notification entity!\n"); return; } \
 			Destroy_Notification_Entity(notif); \
-		}
+		} \
+	} while(0)
 
 	// kill all networked notifications and centerprints
 	#ifdef SVQC
@@ -242,24 +258,24 @@ void Destroy_All_Notifications(void)
 	#endif
 
 	// kill all real notification entities
-	DESTROY_LOOP(MSG_ANNCE, NOTIF_ANNCE_COUNT)
-	DESTROY_LOOP(MSG_INFO, NOTIF_INFO_COUNT)
-	DESTROY_LOOP(MSG_CENTER, NOTIF_CENTER_COUNT)
-	DESTROY_LOOP(MSG_MULTI, NOTIF_MULTI_COUNT)
-	DESTROY_LOOP(MSG_CHOICE, NOTIF_CHOICE_COUNT)
+	DESTROY_LOOP(MSG_ANNCE, NOTIF_ANNCE_COUNT);
+	DESTROY_LOOP(MSG_INFO, NOTIF_INFO_COUNT);
+	DESTROY_LOOP(MSG_CENTER, NOTIF_CENTER_COUNT);
+	DESTROY_LOOP(MSG_MULTI, NOTIF_MULTI_COUNT);
+	DESTROY_LOOP(MSG_CHOICE, NOTIF_CHOICE_COUNT);
 	#undef DESTROY_LOOP
 }
 
 string Process_Notif_Line(
-	float typeid,
-	float chat,
+	int typeId,
+	bool chat,
 	string input,
 	string notiftype,
 	string notifname,
 	string stringtype)
 {
 	#ifdef CSQC
-	if(typeid == MSG_INFO)
+	if(typeId == MSG_INFO)
 	{
 		if((chat && autocvar_notification_allow_chatboxprint)
 			|| (autocvar_notification_allow_chatboxprint == 2))
@@ -281,7 +297,7 @@ string Process_Notif_Line(
 	// done to both MSG_INFO and MSG_CENTER
 	if(substring(input, (strlen(input) - 1), 1) == "\n")
 	{
-		print(sprintf(
+		printf(
 			strcat(
 				"^1TRAILING NEW LINE AT END OF NOTIFICATION: ",
 				"^7net_type = %s, net_name = %s, string = %s.\n"
@@ -289,8 +305,8 @@ string Process_Notif_Line(
 			notiftype,
 			notifname,
 			stringtype
-		));
-		notif_error = TRUE;
+		);
+		notif_error = true;
 		input = substring(input, 1, (strlen(input) - 1));
 	}
 
@@ -306,7 +322,7 @@ string Process_Notif_Args(
 	string selected, remaining = args;
 	float sel_num = 0;
 
-	for(;(remaining != "");)
+	for (;(remaining != "");)
 	{
 		selected = car(remaining); remaining = cdr(remaining);
 
@@ -316,7 +332,7 @@ string Process_Notif_Args(
 			{
 				if(sel_num == NOTIF_MAX_ARGS)
 				{
-					print(sprintf(
+					printf(
 						strcat(
 							"^1NOTIFICATION HAS TOO MANY ARGUMENTS: ",
 							"^7net_type = %s, net_name = %s, max args = %d.\n"
@@ -324,8 +340,8 @@ string Process_Notif_Args(
 						notiftype,
 						notifname,
 						NOTIF_MAX_ARGS
-					));
-					notif_error = TRUE;
+					);
+					notif_error = true;
 					break;
 				}
 
@@ -348,7 +364,7 @@ string Process_Notif_Args(
 					#undef ARG_CASE_ARG_CS_SV_HA
 					default:
 					{
-						print(sprintf(
+						printf(
 							strcat(
 								"^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: ",
 								"^7net_type = %s, net_name = %s, args arg = '%s'.\n"
@@ -356,8 +372,8 @@ string Process_Notif_Args(
 							notiftype,
 							notifname,
 							selected
-						));
-						notif_error = TRUE;
+						);
+						notif_error = true;
 						break;
 					}
 				}
@@ -367,7 +383,7 @@ string Process_Notif_Args(
 			{
 				if(sel_num == NOTIF_MAX_HUDARGS)
 				{
-					print(sprintf(
+					printf(
 						strcat(
 							"^1NOTIFICATION HAS TOO MANY ARGUMENTS: ",
 							"^7net_type = %s, net_name = %s, max hudargs = %d.\n"
@@ -375,8 +391,8 @@ string Process_Notif_Args(
 						notiftype,
 						notifname,
 						NOTIF_MAX_HUDARGS
-					));
-					notif_error = TRUE;
+					);
+					notif_error = true;
 					break;
 				}
 
@@ -399,7 +415,7 @@ string Process_Notif_Args(
 					#undef ARG_CASE_ARG_CS_SV_HA
 					default:
 					{
-						print(sprintf(
+						printf(
 							strcat(
 								"^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: ",
 								"^7net_type = %s, net_name = %s, hudargs arg = '%s'.\n"
@@ -407,8 +423,8 @@ string Process_Notif_Args(
 							notiftype,
 							notifname,
 							selected
-						));
-						notif_error = TRUE;
+						);
+						notif_error = true;
 						break;
 					}
 				}
@@ -418,7 +434,7 @@ string Process_Notif_Args(
 			{
 				if(sel_num == NOTIF_MAX_DURCNT)
 				{
-					print(sprintf(
+					printf(
 						strcat(
 							"^1NOTIFICATION HAS TOO MANY ARGUMENTS: ",
 							"^7net_type = %s, net_name = %s, max durcnt = %d.\n"
@@ -426,8 +442,8 @@ string Process_Notif_Args(
 						notiftype,
 						notifname,
 						NOTIF_MAX_DURCNT
-					));
-					notif_error = TRUE;
+					);
+					notif_error = true;
 					break;
 				}
 
@@ -453,7 +469,7 @@ string Process_Notif_Args(
 						if(ftos(stof(selected)) != "") { ++sel_num; }
 						else
 						{
-							print(sprintf(
+							printf(
 								strcat(
 									"^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: ",
 									"^7net_type = %s, net_name = %s, durcnt arg = '%s'.\n"
@@ -461,8 +477,8 @@ string Process_Notif_Args(
 								notiftype,
 								notifname,
 								selected
-							));
-							notif_error = TRUE;
+							);
+							notif_error = true;
 						}
 						break;
 					}
@@ -477,11 +493,11 @@ string Process_Notif_Args(
 void Create_Notification_Entity(
 	float var_default,
 	float var_cvar,
-	float typeid,
-	float nameid,
+	int typeId,
+	int nameid,
 	string namestring,
-	float strnum,
-	float flnum,
+	int strnum,
+	int flnum,
 	/* MSG_ANNCE */
 	float channel,
 	string snd,
@@ -496,21 +512,21 @@ void Create_Notification_Entity(
 	string normal,
 	string gentle,
 	/* MSG_MULTI */
-	float anncename,
-	float infoname,
-	float centername,
+	int anncename,
+	int infoname,
+	int centername,
 	/* MSG_CHOICE */
 	float challow_def,
 	float challow_var,
-	float chtype,
-	float optiona,
-	float optionb)
+	int chtype,
+	int optiona,
+	int optionb)
 {
 	// =====================
 	//  Global Entity Setup
 	// =====================
 	entity notif = spawn();
-	switch(typeid)
+	switch(typeId)
 	{
 		case MSG_ANNCE:
 		{
@@ -550,7 +566,7 @@ void Create_Notification_Entity(
 					"^1NOTIFICATION WITH IMPROPER TYPE: ",
 					"^7net_type = %d, net_name = %s.\n"
 				),
-				typeid,
+				typeId,
 				namestring
 			));
 			return; // It's not possible to recover from this one
@@ -558,19 +574,19 @@ void Create_Notification_Entity(
 	}
 	notif.nent_default = var_default;
 	notif.nent_enabled = (1 <= var_cvar);
-	notif.nent_type = typeid;
+	notif.nent_type = typeId;
 	notif.nent_id = nameid;
 	notif.nent_name = strzone(namestring);
 
-	string typestring = Get_Notif_TypeName(typeid);
+	string typestring = Get_Notif_TypeName(typeId);
 
 	// Other pre-notif-setup requisites
-	notif_error = FALSE;
+	notif_error = false;
 
 	// ====================
 	//  Notification Setup
 	// ====================
-	switch(typeid)
+	switch(typeId)
 	{
 		case MSG_ANNCE:
 		{
@@ -591,20 +607,20 @@ void Create_Notification_Entity(
 				}
 				else
 				{
-					print(sprintf(
+					printf(
 						strcat(
 							"^1NOTIFICATION WITH NO SOUND: ",
 							"^7net_type = %s, net_name = %s.\n"
 						),
 						typestring,
 						namestring
-					));
-					notif_error = TRUE;
+					);
+					notif_error = true;
 				}
 			}
-			else { notif.nent_enabled = FALSE; }
+			else { notif.nent_enabled = false; }
 			#else
-			notif.nent_enabled = FALSE;
+			notif.nent_enabled = false;
 			#endif
 
 			break;
@@ -621,7 +637,7 @@ void Create_Notification_Entity(
 			#ifdef SVQC
 			float should_process_args = server_is_dedicated;
 			#else
-			float should_process_args = TRUE;
+			float should_process_args = true;
 			#endif
 
 			if(should_process_args)
@@ -638,7 +654,7 @@ void Create_Notification_Entity(
 					}
 					else if((hudargs == "") && (durcnt ==""))
 					{
-						print(sprintf(
+						printf(
 							strcat(
 								"^1NOTIFICATION HAS ARG COUNTS BUT NO ARGS OR HUDARGS OR DURCNT: ",
 								"^7net_type = %s, net_name = %s, strnum = %d, flnum = %d\n"
@@ -647,8 +663,8 @@ void Create_Notification_Entity(
 							namestring,
 							strnum,
 							flnum
-						));
-						notif_error = TRUE;
+						);
+						notif_error = true;
 					}
 				}
 				else if(args != "")
@@ -672,28 +688,28 @@ void Create_Notification_Entity(
 					if(icon != "") { notif.nent_icon = strzone(icon); }
 					else
 					{
-						print(sprintf(
+						printf(
 							strcat(
 								"^1NOTIFICATION HAS HUDARGS BUT NO ICON: ",
 								"^7net_type = %s, net_name = %s.\n"
 							),
 							typestring,
 							namestring
-						));
-						notif_error = TRUE;
+						);
+						notif_error = true;
 					}
 				}
 				else if(icon != "")
 				{
-					print(sprintf(
+					printf(
 						strcat(
 							"^1NOTIFICATION HAS ICON BUT NO HUDARGS: ",
 							"^7net_type = %s, net_name = %s.\n"
 						),
 						typestring,
 						namestring
-					));
-					notif_error = TRUE;
+					);
+					notif_error = true;
 				}
 
 				if(durcnt != "")
@@ -704,15 +720,15 @@ void Create_Notification_Entity(
 					if(cpid != NO_MSG) { notif.nent_cpid = cpid; }
 					else
 					{
-						print(sprintf(
+						printf(
 							strcat(
 								"^1NOTIFICATION HAS DURCNT BUT NO CPID: ",
 								"^7net_type = %s, net_name = %s.\n"
 							),
 							typestring,
 							namestring
-						));
-						notif_error = TRUE;
+						);
+						notif_error = true;
 					}
 				}
 				else if(cpid != NO_MSG) { notif.nent_cpid = cpid; }
@@ -722,39 +738,39 @@ void Create_Notification_Entity(
 				// ======================
 				//  Process Notif String
 				// ======================
-				#define SET_NOTIF_STRING(string,stringname) \
+				#define SET_NOTIF_STRING(string,stringname) do { \
 					notif.nent_string = strzone(CCR( \
 						Process_Notif_Line( \
-							typeid, \
+							typeId, \
 							(var_cvar > 1), \
 							string, \
 							typestring, \
 							namestring, \
 							stringname \
 						)) \
-					);
+					); \
+				} while(0)
 
 				if(GENTLE)
 				{
-					if(gentle != "") { SET_NOTIF_STRING(gentle, "GENTLE") }
-					else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL") }
+					if(gentle != "") { SET_NOTIF_STRING(gentle, "GENTLE"); }
+					else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL"); }
 				}
-				else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL") }
-
+				else if(normal != "") { SET_NOTIF_STRING(normal, "NORMAL"); }
 				#undef SET_NOTIF_STRING
 
 				// Check to make sure a string was chosen
 				if(notif.nent_string == "")
 				{
-					print(sprintf(
+					printf(
 						strcat(
 							"^1EMPTY NOTIFICATION: ",
 							"^7net_type = %s, net_name = %s.\n"
 						),
 						typestring,
 						namestring
-					));
-					notif_error = TRUE;
+					);
+					notif_error = true;
 				}
 			}
 
@@ -766,15 +782,15 @@ void Create_Notification_Entity(
 			// Set MSG_MULTI string/float counts
 			if((anncename == NO_MSG) && (infoname == NO_MSG) && (centername == NO_MSG))
 			{
-				print(sprintf(
+				printf(
 					strcat(
 						"^1NOTIFICATION WITH NO SUBCALLS: ",
 						"^7net_type = %s, net_name = %s.\n"
 					),
 					typestring,
 					namestring
-				));
-				notif_error = TRUE;
+				);
+				notif_error = true;
 			}
 			else
 			{
@@ -810,15 +826,15 @@ void Create_Notification_Entity(
 		{
 			if((chtype == NO_MSG) || (optiona == NO_MSG) || (optionb == NO_MSG))
 			{
-				print(sprintf(
+				printf(
 					strcat(
 						"^1NOTIFICATION IS MISSING CHOICE PARAMS: ",
 						"^7net_type = %s, net_name = %s.\n"
 					),
 					typestring,
 					namestring
-				));
-				notif_error = TRUE;
+				);
+				notif_error = true;
 			}
 			else
 			{
@@ -857,15 +873,15 @@ void Create_Notification_Entity(
 
 					default:
 					{
-						print(sprintf(
+						printf(
 							strcat(
 								"^1NOTIFICATION WITH IMPROPER TYPE: ",
 								"^7net_type = %d, net_name = %s.\n"
 							),
-							typeid,
+							typeId,
 							namestring
-						));
-						notif_error = TRUE;
+						);
+						notif_error = true;
 						break;
 					}
 				}
@@ -900,15 +916,15 @@ void Create_Notification_Entity(
 
 		default:
 		{
-			print(sprintf(
+			printf(
 				strcat(
 					"^1NOTIFICATION WITH IMPROPER TYPE: ",
 					"^7net_type = %d, net_name = %s.\n"
 				),
-				typeid,
+				typeId,
 				namestring
-			));
-			notif_error = TRUE;
+			);
+			notif_error = true;
 			break;
 		}
 	}
@@ -916,8 +932,8 @@ void Create_Notification_Entity(
 	// now check to see if any errors happened
 	if(notif_error)
 	{
-		notif.nent_enabled = FALSE; // disable the notification so it can't cause trouble
-		notif_global_error = TRUE; // throw the red flag that an error happened on init
+		notif.nent_enabled = false; // disable the notification so it can't cause trouble
+		notif_global_error = true; // throw the red flag that an error happened on init
 	}
 }
 
@@ -974,7 +990,7 @@ void Dump_Notifications(float fh, float alsoprint)
 		NOTIF_WRITE(notif_msg) }
 
 	string notif_msg;
-	float i;
+	int i;
 	entity e;
 
 	// Note: This warning only applies to the notifications.cfg file that is output...
@@ -1007,7 +1023,7 @@ void Dump_Notifications(float fh, float alsoprint)
 		if (!e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
 
 		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled)"
+			"0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled"
 		);
 	}
 
@@ -1018,7 +1034,7 @@ void Dump_Notifications(float fh, float alsoprint)
 		if (!e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
 
 		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = off, 1 = print to console, "
+			"0 = off, 1 = print to console, "
 			"2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
 		);
 	}
@@ -1030,7 +1046,7 @@ void Dump_Notifications(float fh, float alsoprint)
 		if (!e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
 
 		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = off, 1 = centerprint"
+			"0 = off, 1 = centerprint"
 		);
 	}
 
@@ -1041,7 +1057,7 @@ void Dump_Notifications(float fh, float alsoprint)
 		if (!e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
 
 		NOTIF_WRITE_ENTITY(
-			"Notification control cvar: 0 = off, 1 = trigger subcalls"
+			"Enable this multiple notification"
 		);
 	}
 
@@ -1052,8 +1068,8 @@ void Dump_Notifications(float fh, float alsoprint)
 		if (!e) { backtrace("Dump_Notifications(): Missing notification entity!\n"); return; }
 
 		NOTIF_WRITE_ENTITY_CHOICE(
-			"Notification control cvar: 0 = off, 1 = trigger option A subcall, 2 = trigger option B subcall",
-			"Notification control cvar: 0 = off, 1 = allowed in warmup mode, 2 = always allowed"
+			"Choice for this notification 0 = off, 1 = default message, 2 = verbose message",
+			"Allow choice for this notification 0 = off, 1 = only in warmup mode, 2 = always"
 		);
 	}
 
@@ -1062,8 +1078,10 @@ void Dump_Notifications(float fh, float alsoprint)
 
 	NOTIF_WRITE_HARDCODED(
 		"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)"
+		"Allow INFO notifications to be printed to chat box"
+		"0 = do not allow, "
+		"1 = allow only if allowed by individual notification_INFO* cvars, "
+		"2 = force all INFO notifications to be printed to the chatbox"
 	);
 
 	NOTIF_WRITE_HARDCODED(
@@ -1186,7 +1204,7 @@ void Debug_Notification(string input)
 string Local_Notification_sprintf(
 	string input, string args,
 	string s1, string s2, string s3, string s4,
-	float f1, float f2, float f3, float f4)
+	int f1, float f2, float f3, float f4)
 {
 	#ifdef NOTIFICATIONS_DEBUG
 	Debug_Notification(sprintf(
@@ -1199,7 +1217,7 @@ string Local_Notification_sprintf(
 	#endif
 
 	string selected;
-	float sel_num;
+	int sel_num;
 	for(sel_num = 0; sel_num < NOTIF_MAX_ARGS; ++sel_num) { arg_slot[sel_num] = ""; }
 
 	string tmp_s;
@@ -1207,7 +1225,7 @@ string Local_Notification_sprintf(
 	for(sel_num = 0;(args != "");)
 	{
 		selected = car(args); args = cdr(args);
-		NOTIF_HIT_MAX(NOTIF_MAX_ARGS, "Local_Notification_sprintf")
+		NOTIF_HIT_MAX(NOTIF_MAX_ARGS, "Local_Notification_sprintf");
 		switch(strtolower(selected))
 		{
 			#ifdef CSQC
@@ -1312,16 +1330,17 @@ void Local_Notification_sound(
 
 void Local_Notification_HUD_Notify_Push(
 	string icon, string hudargs,
-	string s1, string s2, string s3, string s4)
+	string s1, string s2, string s3, string s4,
+	float f1, float f2, float f3, float f4)
 {
 	string selected;
-	float sel_num;
 	arg_slot[0] = ""; arg_slot[1] = "";
 
+	int sel_num;
 	for(sel_num = 0;(hudargs != "");)
 	{
 		selected = car(hudargs); hudargs = cdr(hudargs);
-		NOTIF_HIT_MAX(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push")
+		NOTIF_HIT_MAX(NOTIF_MAX_HUDARGS, "Local_Notification_HUD_Notify_Push");
 		switch(strtolower(selected))
 		{
 			#define ARG_CASE_ARG_CS_SV_HA(selected,result) case selected: { arg_slot[sel_num] = result; ++sel_num; break; }
@@ -1344,10 +1363,11 @@ void Local_Notification_HUD_Notify_Push(
 	}
 	#ifdef NOTIFICATIONS_DEBUG
 	Debug_Notification(sprintf(
-		"Local_Notification_HUD_Notify_Push('%s^7', '%s', %s, %s);\n",
+		"Local_Notification_HUD_Notify_Push('%s^7', '%s', %s, %s, %s);\n",
 		icon,
 		hudargs,
 		MakeConsoleSafe(sprintf("'%s^7', '%s^7', '%s^7', '%s^7'", s1, s2, s3, s4)),
+		sprintf("%d, %d, %d, %d", f1, f2, f3, f4),
 		MakeConsoleSafe(sprintf("'%s^7', '%s^7'", stof(arg_slot[0]), stof(arg_slot[1])))
 	));
 	#endif
@@ -1356,16 +1376,14 @@ void Local_Notification_HUD_Notify_Push(
 
 void Local_Notification_centerprint_generic(
 	string input, string durcnt,
-	float cpid, float f1, float f2)
+	int cpid, float f1, float f2)
 {
-	string selected;
-	float sel_num;
 	arg_slot[0] = ""; arg_slot[1] = "";
 
-	for(sel_num = 0;(durcnt != "");)
+	for(int sel_num = 0;(durcnt != "");)
 	{
-		selected = car(durcnt); durcnt = cdr(durcnt);
-		NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic")
+		string selected = car(durcnt); durcnt = cdr(durcnt);
+		NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic");
 		switch(strtolower(selected))
 		{
 			#define ARG_CASE_ARG_CS_SV_HA(selected,result)
@@ -1405,7 +1423,7 @@ void Local_Notification_centerprint_generic(
 }
 #endif
 
-void Local_Notification(float net_type, float net_name, ...count)
+void Local_Notification(int net_type, int net_name, ...count)
 {
 	// check if this should be aborted
 	if(net_name == NOTIF_ABORT)
@@ -1544,10 +1562,19 @@ void Local_Notification(float net_type, float net_name, ...count)
 			#ifdef CSQC
 			if(notif.nent_icon != "")
 			{
+				if ( notif.nent_iconargs != "" )
+				{
+					notif.nent_icon = Local_Notification_sprintf(
+						notif.nent_icon,notif.nent_iconargs,
+						s1, s2, s3, s4, f1, f2, f3, f4);
+					// remove the newline added by Local_Notification_sprintf
+					notif.nent_icon = strzone(substring(notif.nent_icon,0,strlen(notif.nent_icon)-1));
+				}
 				Local_Notification_HUD_Notify_Push(
 					notif.nent_icon,
 					notif.nent_hudargs,
-					s1, s2, s3, s4);
+					s1, s2, s3, s4,
+					f1, f2, f3, f4);
 			}
 			#endif
 			break;
@@ -1614,7 +1641,7 @@ void Local_Notification(float net_type, float net_name, ...count)
 
 			if(notif.nent_challow_var && (warmup_stage || (notif.nent_challow_var == 2)))
 			{
-				switch(cvar_string(sprintf("notification_%s", notif.nent_name)))
+				switch(cvar(sprintf("notification_%s", notif.nent_name)))
 				{
 					case 1: found_choice = notif.nent_optiona; break;
 					case 2: found_choice = notif.nent_optionb; break;
@@ -1636,7 +1663,7 @@ void Local_Notification(float net_type, float net_name, ...count)
 
 // WOVA = Without Variable Arguments
 void Local_Notification_WOVA(
-	float net_type, float net_name,
+	int net_type, float net_name,
 	float stringcount, float floatcount,
 	string s1, string s2, string s3, string s4,
 	float f1, float f2, float f3, float f4)
@@ -1657,8 +1684,8 @@ void Local_Notification_WOVA(
 #ifdef CSQC
 void Read_Notification(float is_new)
 {
-	float net_type = ReadByte();
-	float net_name = ReadShort();
+	int net_type = ReadByte();
+	int net_name = ReadShort();
 
 	entity notif;
 
@@ -1749,7 +1776,7 @@ void Net_Notification_Remove()
 	remove(self);
 }
 
-float Net_Write_Notification(entity client, float sf)
+float Net_Write_Notification(entity client, int sf)
 {
 	if(Notification_ShouldSend(self.nent_broadcast, client, self.nent_client))
 	{
@@ -1759,9 +1786,9 @@ float Net_Write_Notification(entity client, float sf)
 		WriteShort(MSG_ENTITY, self.nent_net_name);
 		for(i = 0; i < self.nent_stringcount; ++i) { WriteString(MSG_ENTITY, self.nent_strings[i]); }
 		for(i = 0; i < self.nent_floatcount; ++i) { WriteLong(MSG_ENTITY, self.nent_floats[i]); }
-		return TRUE;
+		return true;
 	}
-	else { return FALSE; }
+	else { return false; }
 }
 
 void Kill_Notification(
@@ -1826,7 +1853,7 @@ void Kill_Notification(
 		net_notif.nent_client = client;
 		net_notif.nent_net_type = MSG_CENTER_CPID;
 		net_notif.nent_net_name = killed_cpid;
-		Net_LinkEntity(net_notif, FALSE, autocvar_notification_lifetime_runtime, Net_Write_Notification);
+		Net_LinkEntity(net_notif, false, autocvar_notification_lifetime_runtime, Net_Write_Notification);
 	}
 
 	for(notif = world; (notif = find(notif, classname, "net_notification"));)
@@ -2021,10 +2048,10 @@ void Send_Notification(
 		//   2. Manually handling each separate call on per-usage basis (See old CTF usage of verbose)
 		entity found_choice;
 
-		#define RECURSE_FROM_CHOICE(ent,action) \
+		#define RECURSE_FROM_CHOICE(ent,action) do { \
 			if(notif.nent_challow_var && (warmup_stage || (notif.nent_challow_var == 2))) \
 			{ \
-				switch(ent.msg_choice_choices[net_name]) \
+				switch(ent.msg_choice_choices[net_name - 1]) \
 				{ \
 					case 1: found_choice = notif.nent_optiona; break; \
 					case 2: found_choice = notif.nent_optionb; break; \
@@ -2040,22 +2067,29 @@ void Send_Notification(
 				found_choice.nent_stringcount, \
 				found_choice.nent_floatcount, \
 				s1, s2, s3, s4, \
-				f1, f2, f3, f4);
+				f1, f2, f3, f4); \
+		} while(0)
 
 		switch(broadcast)
 		{
 			case NOTIF_ONE_ONLY: // we can potentially save processing power with this broadcast method
 			{
 				if(IS_REAL_CLIENT(client))
-					{ RECURSE_FROM_CHOICE(client, return) }
+				{
+					RECURSE_FROM_CHOICE(client, return);
+				}
 				break;
 			}
 			default:
 			{
 				entity to;
 				FOR_EACH_REALCLIENT(to)
-					{ if(Notification_ShouldSend(broadcast, to, client))
-						{ RECURSE_FROM_CHOICE(to, continue) } }
+				{
+					if(Notification_ShouldSend(broadcast, to, client))
+					{
+						RECURSE_FROM_CHOICE(to, continue);
+					}
+				}
 				break;
 			}
 		}
@@ -2087,7 +2121,7 @@ void Send_Notification(
 				autocvar_notification_lifetime_mapload
 			);
 
-		Net_LinkEntity(net_notif, FALSE, 0, Net_Write_Notification);
+		Net_LinkEntity(net_notif, false, 0, Net_Write_Notification);
 	}
 }