+#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
entity notif;
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
#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 selected, remaining = args;
float sel_num = 0;
- for(0;(remaining != "");)
+ for (;(remaining != "");)
{
selected = car(remaining); remaining = cdr(remaining);
int typeId,
int nameid,
string namestring,
- float strnum,
- float flnum,
+ int strnum,
+ int flnum,
/* MSG_ANNCE */
float channel,
string snd,
// ======================
// 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, \
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
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
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; }
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)
}
#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)
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;
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))
{
// 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;
}
}