X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnotifications.qc;h=600ddaa1b3237301833480c7ef92cb901333b1a0;hb=26e4227521bef3540881c326dd68b546bef62bcd;hp=2d4691021245085ca693016da1372ddb0838d7d6;hpb=69c1e47c332a6f01f3e30f3d792afdc3c73fdf83;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc index 2d4691021..600ddaa1b 100644 --- a/qcsrc/common/notifications.qc +++ b/qcsrc/common/notifications.qc @@ -1,8 +1,6 @@ #if defined(CSQC) #elif defined(MENUQC) #elif defined(SVQC) - #include "../dpdefs/progsdefs.qh" - #include "../dpdefs/dpextensions.qh" #include "constants.qh" #include "teams.qh" #include "../server/autocvars.qh" @@ -69,7 +67,7 @@ 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##: \ + #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) @@ -296,7 +294,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" @@ -331,7 +329,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" @@ -363,7 +361,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" @@ -382,7 +380,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" @@ -414,7 +412,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" @@ -433,7 +431,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" @@ -468,7 +466,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" @@ -606,7 +604,7 @@ void Create_Notification_Entity( } else { - printf( + LOG_INFOF( strcat( "^1NOTIFICATION WITH NO SOUND: ", "^7net_type = %s, net_name = %s.\n" @@ -653,7 +651,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" @@ -687,7 +685,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" @@ -700,7 +698,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" @@ -719,7 +717,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" @@ -761,7 +759,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" @@ -781,7 +779,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" @@ -825,7 +823,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" @@ -872,7 +870,7 @@ void Create_Notification_Entity( default: { - printf( + LOG_INFOF( strcat( "^1NOTIFICATION WITH IMPROPER TYPE: ", "^7net_type = %d, net_name = %s.\n" @@ -915,7 +913,7 @@ void Create_Notification_Entity( default: { - printf( + LOG_INFOF( strcat( "^1NOTIFICATION WITH IMPROPER TYPE: ", "^7net_type = %d, net_name = %s.\n" @@ -962,7 +960,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( \ @@ -1193,8 +1191,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 @@ -1286,7 +1284,7 @@ void Local_Notification_sound( )); #endif - sound( + _sound( world, soundchannel, sprintf( @@ -1756,7 +1754,7 @@ void Read_Notification(float is_new) #ifdef SVQC void Net_Notification_Remove() -{ +{SELFPARAM(); if (!self) { backtrace(sprintf("Net_Notification_Remove() at %f: Missing self!?\n", time)); return; } #ifdef NOTIFICATIONS_DEBUG @@ -1773,7 +1771,7 @@ void Net_Notification_Remove() remove(self); } -float Net_Write_Notification(entity client, int sf) +bool Net_Write_Notification(entity this, entity client, int sf) { if(Notification_ShouldSend(self.nent_broadcast, client, self.nent_client)) { @@ -1960,6 +1958,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, ...)! ", @@ -1967,13 +1971,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 @@ -1986,6 +1985,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, ...)! ", @@ -1993,13 +1998,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