#if defined(CSQC)
- #include "../dpdefs/csprogsdefs.qh"
- #include "../client/defs.qh"
- #include "teams.qh"
- #include "util.qh"
- #include "buffs.qh"
- #include "counting.qh"
- #include "weapons/weapons.qh"
- #include "../client/autocvars.qh"
- #include "notifications.qh"
- #include "../client/main.qh"
#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"
{
// 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)
// 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"
string selected, remaining = args;
float sel_num = 0;
- for(0;(remaining != "");)
+ for (;(remaining != "");)
{
selected = car(remaining); remaining = cdr(remaining);
{
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"
#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"
{
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"
#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"
{
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"
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"
int typeId,
int nameid,
string namestring,
- float strnum,
- float flnum,
+ int strnum,
+ int flnum,
/* MSG_ANNCE */
float channel,
string snd,
}
else
{
- printf(
+ LOG_INFOF(
strcat(
"^1NOTIFICATION WITH NO SOUND: ",
"^7net_type = %s, net_name = %s.\n"
}
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"
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"
}
else if(icon != "")
{
- printf(
+ LOG_INFOF(
strcat(
"^1NOTIFICATION HAS ICON BUT NO HUDARGS: ",
"^7net_type = %s, net_name = %s.\n"
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"
// 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"
// 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"
{
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"
default:
{
- printf(
+ LOG_INFOF(
strcat(
"^1NOTIFICATION WITH IMPROPER TYPE: ",
"^7net_type = %d, net_name = %s.\n"
default:
{
- printf(
+ LOG_INFOF(
strcat(
"^1NOTIFICATION WITH IMPROPER TYPE: ",
"^7net_type = %d, net_name = %s.\n"
#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,
{
#define NOTIF_WRITE(a) { \
fputs(fh, a); \
- if(alsoprint) { print(a); } }
+ if(alsoprint) { LOG_INFO(a); } }
#define NOTIF_WRITE_ENTITY(description) { \
notif_msg = \
sprintf( \
{
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
));
#endif
- sound(
+ _sound(
world,
soundchannel,
sprintf(
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);
+ string selected = car(durcnt); durcnt = cdr(durcnt);
NOTIF_HIT_MAX(NOTIF_MAX_DURCNT, "Local_Notification_centerprint_generic");
switch(strtolower(selected))
{
}
#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)
#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,
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;
// 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)
#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;
#ifdef SVQC
void Net_Notification_Remove()
-{
+{SELFPARAM();
if (!self) { backtrace(sprintf("Net_Notification_Remove() at %f: Missing self!?\n", time)); return; }
#ifdef NOTIFICATIONS_DEBUG
));
#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)
+{SELFPARAM();
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; }
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, ...)! ",
"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
}
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, ...)! ",
"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
// 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 - 1]) \
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;
}
}
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;
projects / xonotic / xonotic-data.pk3dir.git / blobdiff