// ================================================
// Unified notification system, written by Samual
-// Last updated: December, 2012
+// Last updated: February, 2013
// ================================================
// main types/groups of notifications
#define MSG_WEAPON 3 // "Personal" weapon messages (like "You got the Nex", sent to weapon notify panel)
#define MSG_DEATH 4 // "Personal" AND "Global" death messages
-#define TCR(input,teamcolor,teamtext) strreplace("^TC", teamcolor, strreplace("^TT", teamtext, input))
-
-// select between the normal or the gentle message string based on client (or server) settings
-/*string normal_or_gentle(string normal, string gentle)
-{
- if(GENTLE)
- return ((gentle != "") ? gentle : normal);
- else
- return normal;
-}*/
-#define normal_or_gentle(normal,gentle) (GENTLE ? ((gentle != "") ? gentle : normal) : normal)
-
-void Dump_Notifications(float fh, float alsoprint);
-
#ifndef MENUQC // SERVER AND CLIENT ONLY
-// Since this code uses macro processors to list notifications,
-// the normal compiler sees these checks as "constant" and throws
-// a warning. We have to get around this by using another function.
-//#define NOTIF_MATCH(a,b) if(min(NOTIF_MAX, a) == b)
-//#define NOTIF_MATCH(a,b) tmp_f = a; if(tmp_f == b)
-
// notification system nullified arguments
#define NO_STR_ARG ""
#define NO_FL_ARG -12345
// field identifiers for Get_Field_Value()
#define F_NAME 1
-#define F_STRNUM 2
-#define F_FLNUM 3
+#define F_INFNAME 2
+#define F_CENNAME 3
+#define F_INFVAL 4
+#define F_CENVAL 5
+#define F_STRNUM 6
+#define F_FLNUM 7
// ping of bots defined for extra frag message notification information
#define BOT_PING -1
#define WEAPON_NAME f1 // weaponorder[f1].netname
#endif
-#define ADD_AUTOCVAR(name) var float autocvar_notification_##name = TRUE;
-#define CHECK_AUTOCVAR(name) if(autocvar_notification_##name)
+#define NOTIF_SWITCH_LIST(net_type,net_name,returnv) \
+ switch(net_name) \
+ { \
+ ##net_type##_NOTIFICATIONS \
+ default: { backtrace(strcat("^1NOTIFICATION HAD NO MATCH: ^7net_type = ", VAR_TO_TEXT(net_type), ", net_name = ", ftos(net_name), ".\n")); returnv; } \
+ }
string Get_Field_Value(float field, float net_type, float net_name); // get the actual name of a notification and return it as a string
void Local_Notification(float net_type, float net_name, ...count);
.string nent_strings[4];
.float nent_floats[4];
-// allow sending of notifications to also pass through to spectators (specifically for centerprints)
-#define WRITESPECTATABLE_MSG_ONE_VARNAME(varname,statement) entity varname; varname = msg_entity; FOR_EACH_REALCLIENT(msg_entity) if(msg_entity == varname || (msg_entity.classname == STR_SPECTATOR && msg_entity.enemy == varname)) statement msg_entity = varname
-#define WRITESPECTATABLE_MSG_ONE(statement) WRITESPECTATABLE_MSG_ONE_VARNAME(oldmsg_entity, statement)
-#define WRITESPECTATABLE(msg,statement) if(msg == MSG_ONE) { WRITESPECTATABLE_MSG_ONE(statement); } else statement float WRITESPECTATABLE_workaround = 0
-
-#define IFSTR(num) ((num <= (stringcount-1)) ? ...(num, string) : NO_STR_ARG)
+#define IFSTR(num) ((num < stringcount) ? ...(num, string) : NO_STR_ARG)
#define IFFL(num) ((((stringcount-1) + num) < count) ? ...(((stringcount-1) + num), float) : NO_FL_ARG)
void Send_Notification(float broadcast, entity client, float net_type, float net_name, ...count);
#endif // ifdef SVQC
#endif // ifndef MENUQC
+// MENU, SERVER, AND CLIENT
+void Dump_Notifications(float fh, float alsoprint);
+
// ====================================
// Notifications List and Information
users to create unique color profiles for their HUD, giving more customization
options to HUD designers and end users who want such a feature.
- Check out the function calls for string CCR(...) and
- string TCR(...) to better understand how these codes work.
+ Check out the definitions in util.qc/util.qh/teams.qh for string CCR(...) and
+ string TCR(...) to better understand how these code replacements work.
Guidlines for notification declaration (please try and follow these):
Specific rules:
MSG_INFO_NOTIF(prefix##PINK, strnum, flnum, args, hudargs, sprintf(icon, strtolower(STR_TEAM_4)), TCR(normal, COL_TEAM_4, strtoupper(STR_TEAM_4)), TCR(gentle, COL_TEAM_4, strtoupper(STR_TEAM_4))) \
#endif
#define MSG_INFO_NOTIFICATIONS \
- MSG_INFO_NOTIF(INFO_EMPTY, 0, 0, NO_STR_ARG, XPD("", ""), "", "empty", "") \
+ /*MSG_INFO_NOTIF(INFO_EMPTY, 0, 0, NO_STR_ARG, XPD("", ""), "", "", "")*/ \
MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DROPPED_, 2, 0, 0, NO_STR_ARG, XPD("", ""), "", _("^BGThe ^TC^TT^BG flag was dropped in the base and returned itself\n"), "") \
MULTITEAM_INFO(INFO_CTF_FLAGRETURN_DAMAGED_, 2, 0, 0, NO_STR_ARG, XPD("", ""), "", _("^BGThe ^TC^TT^BG flag was destroyed and returned to base\n"), "") \
MULTITEAM_INFO(INFO_CTF_FLAGRETURN_SPEEDRUN_, 2, 0, 1, f1/100, XPD("", ""), "", _("^BGThe ^TC^TT^BG flag became impatient after ^F1%.2f^BG seconds and returned itself\n"), "") \
MSG_INFO_NOTIF(INFO_DEATH_MURDER_TOUCHEXPLODE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 died in an accident with ^BG%s^K1%s\n"), "") \
MSG_INFO_NOTIF(INFO_DEATH_MURDER_CHEAT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was unfairly eliminated by ^BG%s^K1%s\n"), "") \
MSG_INFO_NOTIF(INFO_DEATH_MURDER_FIRE, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was burnt up into a crisp by ^BG%s^K1%s\n"), _("^F1%s^K1 felt a little hot from ^BG%s^K1's fire^K1%s\n")) \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_CRUSH, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was crushed by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_MINIGUN, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 got shredded by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_ROCKET, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was blasted to bits by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_SPID_DEATH, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_GUN, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was bolted down by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_ROCKET, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 couldn't find shelter from ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_WAKI_DEATH, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_CANNON, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 couldn't resist ^BG%s^K1 purple blobs%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_BOMB, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 was cluster bombed by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_RAPT_DEATH, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 got caught in the blast when ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_GUN, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_RAY, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_RAY_HEAL, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_DEATH_MURDER_VH_BUMB_DEATH, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "notify_death", _("^BG%s^K1 foobar by ^BG%s^K1%s\n"), "") \
MULTITEAM_INFO(INFO_FREEZETAG_ROUND_WIN_, 4, 0, 0, NO_STR_ARG, XPD("", ""), "", _("^TC^TT^BG team wins the round, all other teams were frozen\n"), "") \
MSG_INFO_NOTIF(INFO_FREEZETAG_REVIVE, 2, 0, XPD(s1, s2), XPD("", ""), "", _("^BG%s^K3 was revived by ^BG%s\n"), "") \
MSG_INFO_NOTIF(INFO_FREEZETAG_FREEZE, 2, 0, XPD(s1, s2), XPD("", ""), "", _("^BG%s^K1 was frozen by ^BG%s\n"), "") \
MSG_INFO_NOTIF(INFO_VERSION_BETA, 2, 0, XPD(s1, s2), XPD("", ""), "", _("\{1}^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have ^F2Xonotic %s\n"), "") \
MSG_INFO_NOTIF(INFO_VERSION_OLD, 2, 0, XPD(s1, s2), XPD("", ""), "", _("\{1}^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s\n"), "") \
MSG_INFO_NOTIF(INFO_VERSION_OUTDATED, 2, 0, XPD(s1, s2), XPD("", ""), "", _("\{1}^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!\n"), "") \
- MSG_INFO_NOTIF(INFO_WATERMARK, 1, 0, s1, XPD("", ""), "", _("^F4SVQC Build information: ^BG%s\n"), "") \
+ MSG_INFO_NOTIF(INFO_WATERMARK, 1, 0, s1, XPD("", ""), "", _("^F3SVQC Build information: ^F4%s\n"), "") \
MSG_INFO_NOTIF(INFO_WEAPON_THINKING_WITH_PORTALS, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "notify_selfkill", _("^BG%s^K1 is now thinking with portals%s\n"), "") \
MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_SUICIDE, 1, 1, XPD(s1, SPREE_LOST), XPD(s1, ""), "weaponcrylink", _("^BG%s^K1 felt the strong pull of their Crylink%s\n"), "") \
MSG_INFO_NOTIF(INFO_WEAPON_CRYLINK_MURDER, 2, 1, XPD(s1, s2, SPREE_END), XPD(s2, s1), "weaponcrylink", _("^BG%s^K1 felt the strong pull of ^BG%s^K1's Crylink%s\n"), "") \
MSG_CENTER_NOTIF(prefix##PINK, strnum, flnum, args, cpid, durcnt, TCR(normal, COL_TEAM_4, strtoupper(STR_TEAM_4)), TCR(gentle, COL_TEAM_4, strtoupper(STR_TEAM_4))) \
#endif
#define MSG_CENTER_NOTIFICATIONS \
- MSG_CENTER_NOTIF(CENTER_EMPTY, 0, 0, NO_STR_ARG, NO_CPID, XPD(0, 0), "null", "") \
+ /*MSG_CENTER_NOTIF(CENTER_EMPTY, 0, 0, NO_STR_ARG, NO_CPID, XPD(0, 0), "null", "")*/ \
MSG_CENTER_NOTIF(CENTER_ASSAULT_ATTACKING, 0, 0, NO_STR_ARG, CPID_ASSAULT_ROLE, XPD(0, 0), _("^BGYou are attacking!"), "") \
MSG_CENTER_NOTIF(CENTER_ASSAULT_DEFENDING, 0, 0, NO_STR_ARG, CPID_ASSAULT_ROLE, XPD(0, 0), _("^BGYou are defending!"), "") \
MSG_CENTER_NOTIF(CENTER_CTF_CAPTURESHIELD_SHIELDED, 0, 0, NO_STR_ARG, CPID_CTF_CAPSHIELD, XPD(0, 0), _("^BGYou are now ^F1shielded^BG from the flag\n^BGfor ^F2too many unsuccessful attempts^BG to capture.\n^BGMake some defensive scores before trying again."), "") \
MSG_CENTER_NOTIF(CENTER_WEAPON_MARBLES_LOST, 1, 1, XPD(s1, WEAPON_NAME), NO_CPID, XPD(0, 0), _("^K1You lost your marbles against ^BG%s^K1 using the ^BG%s!"), "")
#define MSG_WEAPON_NOTIFICATIONS \
- MSG_WEAPON_NOTIF(WEAPON_EMPTY, NO_MSG, NO_MSG) \
+ /*MSG_WEAPON_NOTIF(WEAPON_EMPTY, NO_MSG, NO_MSG)*/ \
MSG_WEAPON_NOTIF(WEAPON_THINKING_WITH_PORTALS, INFO_WEAPON_THINKING_WITH_PORTALS, CENTER_DEATH_SELF_GENERIC) \
MSG_WEAPON_NOTIF(WEAPON_CRYLINK_SUICIDE, INFO_WEAPON_CRYLINK_SUICIDE, CENTER_DEATH_SELF_GENERIC) \
MSG_WEAPON_NOTIF(WEAPON_CRYLINK_MURDER, INFO_WEAPON_CRYLINK_MURDER, NO_MSG) \
MSG_WEAPON_NOTIF(WEAPON_UZI_MURDER_SPRAY, INFO_WEAPON_UZI_MURDER_SPRAY, NO_MSG)
#define MSG_DEATH_NOTIFICATIONS \
- MSG_DEATH_NOTIF(DEATH_EMPTY, NO_MSG, NO_MSG) \
+ /*MSG_DEATH_NOTIF(DEATH_EMPTY, NO_MSG, NO_MSG)*/ \
MSG_DEATH_NOTIF(DEATH_SELF_CUSTOM, INFO_DEATH_SELF_GENERIC, CENTER_DEATH_SELF_CUSTOM) \
MSG_DEATH_NOTIF(DEATH_SELF_GENERIC, INFO_DEATH_SELF_GENERIC, CENTER_DEATH_SELF_GENERIC) \
MSG_DEATH_NOTIF(DEATH_SELF_VOID, INFO_DEATH_SELF_VOID, CENTER_DEATH_SELF_VOID) \
MSG_DEATH_NOTIF(DEATH_MURDER_TOUCHEXPLODE, INFO_DEATH_MURDER_TOUCHEXPLODE, NO_MSG) \
MSG_DEATH_NOTIF(DEATH_MURDER_CHEAT, INFO_DEATH_MURDER_CHEAT, NO_MSG) \
MSG_DEATH_NOTIF(DEATH_MURDER_FIRE, INFO_DEATH_MURDER_FIRE, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_CRUSH, INFO_DEATH_MURDER_VH_CRUSH, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_SPID_MINIGUN, INFO_DEATH_MURDER_VH_SPID_MINIGUN, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_SPID_ROCKET, INFO_DEATH_MURDER_VH_SPID_ROCKET, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_SPID_DEATH, INFO_DEATH_MURDER_VH_SPID_DEATH, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_WAKI_GUN, INFO_DEATH_MURDER_VH_WAKI_GUN, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_WAKI_ROCKET, INFO_DEATH_MURDER_VH_WAKI_ROCKET, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_WAKI_DEATH, INFO_DEATH_MURDER_VH_WAKI_DEATH, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_RAPT_CANNON, INFO_DEATH_MURDER_VH_RAPT_CANNON, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_RAPT_BOMB, INFO_DEATH_MURDER_VH_RAPT_BOMB, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_RAPT_FRAGMENT, INFO_DEATH_MURDER_VH_RAPT_FRAGMENT, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_RAPT_DEATH, INFO_DEATH_MURDER_VH_RAPT_DEATH, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_BUMB_GUN, INFO_DEATH_MURDER_VH_BUMB_GUN, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_BUMB_RAY, INFO_DEATH_MURDER_VH_BUMB_RAY, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_BUMB_RAY_HEAL, INFO_DEATH_MURDER_VH_BUMB_RAY_HEAL, NO_MSG) \
+ MSG_DEATH_NOTIF(DEATH_MURDER_VH_BUMB_DEATH, INFO_DEATH_MURDER_VH_BUMB_DEATH, NO_MSG) \
MSG_DEATH_NOTIF(DEATH_MURDER_FRAG, NO_MSG, CENTER_DEATH_MURDER_FRAG) \
MSG_DEATH_NOTIF(DEATH_MURDER_FRAGGED, NO_MSG, CENTER_DEATH_MURDER_FRAGGED) \
MSG_DEATH_NOTIF(DEATH_MURDER_TYPEFRAG, NO_MSG, CENTER_DEATH_MURDER_TYPEFRAG) \
// Initialization/Create Declarations
// ====================================
+#ifndef MENUQC // Menu doesn't need init
+
#define NOTIF_FIRST 1
#define NOTIF_MAX 1024 // limit of recursive functions with ACCUMULATE_FUNCTION
+#define ADD_AUTOCVAR(name) var float autocvar_notification_##name = TRUE;
+#define CHECK_AUTOCVAR(name) if(autocvar_notification_##name)
+
#define CHECK_NOTIFICATION_1(net_type,net_name,check_newline,normal,gentle) \
if((normal == "") || ((normal == "") && (gentle == ""))) { print(strcat("^1EMPTY NOTIFICATION: ^7net_type = ", net_type, ", net_name = ", VAR_TO_TEXT(net_name), ".\n")); } \
#if check_newline \
} \
#endif
-#define CHECK_NOTIFICATION_2(net_type,net_name,infoname,centername) if not(#infoname || #centername) { print(strcat("^1NOTIFICATION WITH NO SUBCALLS: ^7net_type = ", net_type, ", net_name = ", VAR_TO_TEXT(net_name), ".\n")); }
+#define CHECK_NOTIFICATION_2(net_type,net_name,infoname,centername) \
+ #if (infoname == NO_MSG) && (centername == NO_MSG) \
+ print(strcat("^1NOTIFICATION WITH NO SUBCALLS: ^7net_type = ", #net_type, ", net_name = ", #net_name, ".\n")); \
+ #endif
float NOTIF_INFO_COUNT;
float NOTIF_CENTER_COUNT;
float NOTIF_CPID_COUNT;
#define MSG_INFO_NOTIF(name,strnum,flnum,args,hudargs,icon,normal,gentle) \
- #ifndef MENUQC \
- ADD_AUTOCVAR(name) \
- #endif \
+ ADD_AUTOCVAR(name) \
float name; \
void RegisterNotification_##name() \
{ \
SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_INFO_COUNT) \
CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_INFO_COUNT, "notifications") \
- /*CHECK_NOTIFICATION_1("MSG_INFO", name, TRUE, normal, gentle)*/ \
+ CHECK_NOTIFICATION_1("MSG_INFO", name, 1, normal, gentle) \
} \
ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name)
#define MSG_CENTER_NOTIF(name,strnum,flnum,args,cpid,durcnt,normal,gentle) \
- #ifndef MENUQC \
- ADD_AUTOCVAR(name) \
- #endif \
+ ADD_AUTOCVAR(name) \
float name; \
float cpid; \
void RegisterNotification_##name() \
SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_CENTER_COUNT) \
SET_FIELD_COUNT(cpid, NOTIF_FIRST, NOTIF_CPID_COUNT) \
CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_CENTER_COUNT, "notifications") \
- /*CHECK_NOTIFICATION_1("MSG_CENTER", name, FALSE, normal, gentle)*/ \
+ CHECK_NOTIFICATION_1("MSG_CENTER", name, 0, normal, gentle) \
} \
ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name)
#define MSG_WEAPON_NOTIF(name,infoname,centername) \
- #ifndef MENUQC \
- ADD_AUTOCVAR(name) \
- #endif \
+ ADD_AUTOCVAR(name) \
float name; \
void RegisterNotification_##name() \
{ \
SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_WEAPON_COUNT) \
CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_WEAPON_COUNT, "notifications") \
- /*CHECK_NOTIFICATION_2("MSG_WEAPON", name, infoname, centername)*/ \
+ CHECK_NOTIFICATION_2("MSG_WEAPON", name, infoname, centername) \
} \
ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name)
#define MSG_DEATH_NOTIF(name,infoname,centername) \
- #ifndef MENUQC \
- ADD_AUTOCVAR(name) \
- #endif \
+ ADD_AUTOCVAR(name) \
float name; \
void RegisterNotification_##name() \
{ \
SET_FIELD_COUNT(name, NOTIF_FIRST, NOTIF_DEATH_COUNT) \
CHECK_MAX_COUNT(name, NOTIF_MAX, NOTIF_DEATH_COUNT, "notifications") \
- /*CHECK_NOTIFICATION_2("MSG_DEATH", name, infoname, centername)*/ \
+ CHECK_NOTIFICATION_2("MSG_DEATH", name, infoname, centername) \
} \
ACCUMULATE_FUNCTION(RegisterNotifications, RegisterNotification_##name)
#undef MSG_CENTER_NOTIF
#undef MSG_WEAPON_NOTIF
#undef MSG_DEATH_NOTIF
+
+#undef ADD_AUTOCVAR
+
+#endif // ifndef MENUQC
projects / xonotic / xonotic-data.pk3dir.git / blobdiff