X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications.qc;h=5145e5340cff8f3a78748bb88c1d107e90ac8e08;hp=4c2c30ebb84c2e244389417789bef6855df07aba;hb=86c9dc7c3696c329496b06375c1e79fb407401ce;hpb=138cbbad0d235f41c6473bb5aa92169808485417

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 4c2c30ebb..5145e5340 100644
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -5,7 +5,6 @@
     #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"
@@ -297,7 +296,7 @@ string Process_Notif_Line(
 	// done to both MSG_INFO and MSG_CENTER
 	if(substring(input, (strlen(input) - 1), 1) == "\n")
 	{
-		printf(
+		LOG_INFOF(
 			strcat(
 				"^1TRAILING NEW LINE AT END OF NOTIFICATION: ",
 				"^7net_type = %s, net_name = %s, string = %s.\n"
@@ -332,7 +331,7 @@ string Process_Notif_Args(
 			{
 				if(sel_num == NOTIF_MAX_ARGS)
 				{
-					printf(
+					LOG_INFOF(
 						strcat(
 							"^1NOTIFICATION HAS TOO MANY ARGUMENTS: ",
 							"^7net_type = %s, net_name = %s, max args = %d.\n"
@@ -364,7 +363,7 @@ string Process_Notif_Args(
 					#undef ARG_CASE_ARG_CS_SV_HA
 					default:
 					{
-						printf(
+						LOG_INFOF(
 							strcat(
 								"^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: ",
 								"^7net_type = %s, net_name = %s, args arg = '%s'.\n"
@@ -383,7 +382,7 @@ string Process_Notif_Args(
 			{
 				if(sel_num == NOTIF_MAX_HUDARGS)
 				{
-					printf(
+					LOG_INFOF(
 						strcat(
 							"^1NOTIFICATION HAS TOO MANY ARGUMENTS: ",
 							"^7net_type = %s, net_name = %s, max hudargs = %d.\n"
@@ -415,7 +414,7 @@ string Process_Notif_Args(
 					#undef ARG_CASE_ARG_CS_SV_HA
 					default:
 					{
-						printf(
+						LOG_INFOF(
 							strcat(
 								"^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: ",
 								"^7net_type = %s, net_name = %s, hudargs arg = '%s'.\n"
@@ -434,7 +433,7 @@ string Process_Notif_Args(
 			{
 				if(sel_num == NOTIF_MAX_DURCNT)
 				{
-					printf(
+					LOG_INFOF(
 						strcat(
 							"^1NOTIFICATION HAS TOO MANY ARGUMENTS: ",
 							"^7net_type = %s, net_name = %s, max durcnt = %d.\n"
@@ -469,7 +468,7 @@ string Process_Notif_Args(
 						if(ftos(stof(selected)) != "") { ++sel_num; }
 						else
 						{
-							printf(
+							LOG_INFOF(
 								strcat(
 									"^1NOTIFICATION WITH UNKNOWN TOKEN IN ARGUMENT STRING: ",
 									"^7net_type = %s, net_name = %s, durcnt arg = '%s'.\n"
@@ -607,7 +606,7 @@ void Create_Notification_Entity(
 				}
 				else
 				{
-					printf(
+					LOG_INFOF(
 						strcat(
 							"^1NOTIFICATION WITH NO SOUND: ",
 							"^7net_type = %s, net_name = %s.\n"
@@ -654,7 +653,7 @@ void Create_Notification_Entity(
 					}
 					else if((hudargs == "") && (durcnt ==""))
 					{
-						printf(
+						LOG_INFOF(
 							strcat(
 								"^1NOTIFICATION HAS ARG COUNTS BUT NO ARGS OR HUDARGS OR DURCNT: ",
 								"^7net_type = %s, net_name = %s, strnum = %d, flnum = %d\n"
@@ -688,7 +687,7 @@ void Create_Notification_Entity(
 					if(icon != "") { notif.nent_icon = strzone(icon); }
 					else
 					{
-						printf(
+						LOG_INFOF(
 							strcat(
 								"^1NOTIFICATION HAS HUDARGS BUT NO ICON: ",
 								"^7net_type = %s, net_name = %s.\n"
@@ -701,7 +700,7 @@ void Create_Notification_Entity(
 				}
 				else if(icon != "")
 				{
-					printf(
+					LOG_INFOF(
 						strcat(
 							"^1NOTIFICATION HAS ICON BUT NO HUDARGS: ",
 							"^7net_type = %s, net_name = %s.\n"
@@ -720,7 +719,7 @@ void Create_Notification_Entity(
 					if(cpid != NO_MSG) { notif.nent_cpid = cpid; }
 					else
 					{
-						printf(
+						LOG_INFOF(
 							strcat(
 								"^1NOTIFICATION HAS DURCNT BUT NO CPID: ",
 								"^7net_type = %s, net_name = %s.\n"
@@ -762,7 +761,7 @@ void Create_Notification_Entity(
 				// Check to make sure a string was chosen
 				if(notif.nent_string == "")
 				{
-					printf(
+					LOG_INFOF(
 						strcat(
 							"^1EMPTY NOTIFICATION: ",
 							"^7net_type = %s, net_name = %s.\n"
@@ -782,7 +781,7 @@ void Create_Notification_Entity(
 			// Set MSG_MULTI string/float counts
 			if((anncename == NO_MSG) && (infoname == NO_MSG) && (centername == NO_MSG))
 			{
-				printf(
+				LOG_INFOF(
 					strcat(
 						"^1NOTIFICATION WITH NO SUBCALLS: ",
 						"^7net_type = %s, net_name = %s.\n"
@@ -826,7 +825,7 @@ void Create_Notification_Entity(
 		{
 			if((chtype == NO_MSG) || (optiona == NO_MSG) || (optionb == NO_MSG))
 			{
-				printf(
+				LOG_INFOF(
 					strcat(
 						"^1NOTIFICATION IS MISSING CHOICE PARAMS: ",
 						"^7net_type = %s, net_name = %s.\n"
@@ -873,7 +872,7 @@ void Create_Notification_Entity(
 
 					default:
 					{
-						printf(
+						LOG_INFOF(
 							strcat(
 								"^1NOTIFICATION WITH IMPROPER TYPE: ",
 								"^7net_type = %d, net_name = %s.\n"
@@ -916,7 +915,7 @@ void Create_Notification_Entity(
 
 		default:
 		{
-			printf(
+			LOG_INFOF(
 				strcat(
 					"^1NOTIFICATION WITH IMPROPER TYPE: ",
 					"^7net_type = %d, net_name = %s.\n"
@@ -946,8 +945,7 @@ void Create_Notification_Entity(
 #ifdef SVQC
 void Notification_GetCvars(void)
 {
-	float i;
-	for(i = 0; i <= NOTIF_CHOICE_COUNT; ++i)
+	for(int i = 0; i <= NOTIF_CHOICE_COUNT; ++i)
 	{
 		GetCvars_handleFloat(
 			get_cvars_s,
@@ -964,7 +962,7 @@ void Dump_Notifications(float fh, float alsoprint)
 {
 	#define NOTIF_WRITE(a) { \
 		fputs(fh, a); \
-		if(alsoprint) { print(a); } }
+		if(alsoprint) { LOG_INFO(a); } }
 	#define NOTIF_WRITE_ENTITY(description) { \
 		notif_msg = \
 			sprintf( \
@@ -1195,8 +1193,8 @@ void Debug_Notification(string input)
 {
 	switch(autocvar_notification_debug)
 	{
-		case 1: { dprint(input); break; }
-		case 2: { print(input); break; }
+		case 1: { LOG_TRACE(input); break; }
+		case 2: { LOG_INFO(input); break; }
 	}
 }
 #endif
@@ -1552,7 +1550,7 @@ void Local_Notification(int net_type, int net_name, ...count)
 
 		case MSG_INFO:
 		{
-			print(
+			LOG_INFO(
 				Local_Notification_sprintf(
 					notif.nent_string,
 					notif.nent_args,
@@ -1641,7 +1639,7 @@ void Local_Notification(int net_type, int 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;
@@ -1771,21 +1769,19 @@ void Net_Notification_Remove()
 	));
 	#endif
 
-	float i;
-	for(i = 0; i < 4; ++i) { if(self.nent_strings[i]) { strunzone(self.nent_strings[i]); } }
+	for(int i = 0; i < 4; ++i) { if(self.nent_strings[i]) { strunzone(self.nent_strings[i]); } }
 	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))
 	{
-		float i;
 		WriteByte(MSG_ENTITY, ENT_CLIENT_NOTIFICATION);
 		WriteByte(MSG_ENTITY, self.nent_net_type);
 		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]); }
+		for(int i = 0; i < self.nent_stringcount; ++i) { WriteString(MSG_ENTITY, self.nent_strings[i]); }
+		for(int i = 0; i < self.nent_floatcount; ++i) { WriteLong(MSG_ENTITY, self.nent_floats[i]); }
 		return true;
 	}
 	else { return false; }
@@ -1964,6 +1960,12 @@ void Send_Notification(
 
 	if((notif.nent_stringcount + notif.nent_floatcount) > count)
 	{
+		string s =
+		#ifdef NOTIFICATIONS_DEBUG
+		Get_Notif_BroadcastName(broadcast);
+		#else
+		ftos(broadcast);
+		#endif
 		backtrace(sprintf(
 			strcat(
 				"Not enough arguments for Send_Notification(%s, ...)! ",
@@ -1971,13 +1973,8 @@ void Send_Notification(
 				"Check the definition and function call for accuracy...?\n"
 			),
 			sprintf(
-				#ifdef NOTIFICATIONS_DEBUG
 				"%s, '%s', %s, %s",
-				Get_Notif_BroadcastName(broadcast),
-				#else
-				"%d, '%s', %s, %s",
-				broadcast,
-				#endif
+				s,
 				client.classname,
 				Get_Notif_TypeName(net_type),
 				notif.nent_name
@@ -1990,6 +1987,12 @@ void Send_Notification(
 	}
 	else if((notif.nent_stringcount + notif.nent_floatcount) < count)
 	{
+		string s =
+		#ifdef NOTIFICATIONS_DEBUG
+		Get_Notif_BroadcastName(broadcast);
+		#else
+		ftos(broadcast);
+		#endif
 		backtrace(sprintf(
 			strcat(
 				"Too many arguments for Send_Notification(%s, ...)! ",
@@ -1997,13 +2000,8 @@ void Send_Notification(
 				"Check the definition and function call for accuracy...?\n"
 			),
 			sprintf(
-				#ifdef NOTIFICATIONS_DEBUG
 				"%s, '%s', %s, %s",
-				Get_Notif_BroadcastName(broadcast),
-				#else
-				"%d, '%s', %s, %s",
-				broadcast,
-				#endif
+				s,
 				client.classname,
 				Get_Notif_TypeName(net_type),
 				notif.nent_name
@@ -2106,10 +2104,9 @@ void Send_Notification(
 		net_notif.nent_stringcount = notif.nent_stringcount;
 		net_notif.nent_floatcount = notif.nent_floatcount;
 
-		float i;
-		for(i = 0; i < net_notif.nent_stringcount; ++i)
+		for(int 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)
+		for(int 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;