Merge branch 'master' into terencehill/bot_AI

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / notifications / all.qc

diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc
index 642439c0205175a8b8c79de1f5df13827e9624e6..2a9217b25bbdb409dd10c92d71902a5a995e82e2 100644 (file)
--- a/qcsrc/common/notifications/all.qc
+++ b/qcsrc/common/notifications/all.qc
@@ -148,7 +148,6 @@ bool Notification_ShouldSend(NOTIF broadcast, entity to_client, entity other_cli
 void Destroy_Notification_Entity(entity notif)
 {
        if (notif.nent_name != "") strunzone(notif.nent_name);
-       if (notif.nent_cvarname != "") strunzone(notif.nent_cvarname);
        if (notif.nent_snd != "") strunzone(notif.nent_snd);
        if (notif.nent_args != "") strunzone(notif.nent_args);
        if (notif.nent_hudargs != "") strunzone(notif.nent_hudargs);
@@ -400,7 +399,6 @@ void Create_Notification_Entity(entity notif,
        float var_cvar,
        MSG typeId,
        string namestring,
-       string cvarnamestring,
        int teamnum)
 {
        // =====================
@@ -410,8 +408,6 @@ void Create_Notification_Entity(entity notif,
        notif.nent_enabled = (var_cvar >= 1);
        notif.nent_type = typeId;
        notif.nent_name = strzone(namestring);
-       if(namestring != cvarnamestring)
-               notif.nent_cvarname = strzone(cvarnamestring);
        notif.nent_teamnum = teamnum;
 
        // Other pre-notif-setup requisites
@@ -767,14 +763,13 @@ void Create_Notification_Entity_Choice(entity notif,
 #ifdef SVQC
 void Notification_GetCvars(entity this)
 {
-       FOREACH(Notifications, it.nent_type == MSG_CHOICE && (!it.nent_teamnum || it.nent_teamnum == 1), {
-               string cvarname = (it.nent_cvarname ? it.nent_cvarname : it.nent_name);
+       FOREACH(Notifications, it.nent_type == MSG_CHOICE, {
                GetCvars_handleFloat(
                        this,
                        get_cvars_s,
                        get_cvars_f,
                        msg_choice_choices[it.nent_choice_idx],
-                       sprintf("notification_%s", cvarname)
+                       sprintf("notification_%s", Get_Notif_CvarName(it))
                );
        });
 }
@@ -789,21 +784,19 @@ void Dump_Notifications(int fh, bool alsoprint)
        } MACRO_END
 
        #define NOTIF_WRITE_ENTITY(e, description) MACRO_BEGIN { \
-               string cvarname = (e.nent_cvarname ? e.nent_cvarname : e.nent_name); \
                string notif_msg = sprintf( \
                        "seta notification_%s \"%d\" \"%s\"\n", \
-                       cvarname, e.nent_default, description \
+                       Get_Notif_CvarName(e), e.nent_default, description \
                ); \
                NOTIF_WRITE(notif_msg); \
        } MACRO_END
 
        #define NOTIF_WRITE_ENTITY_CHOICE(e, descriptiona, descriptionb) MACRO_BEGIN { \
-               string cvarname = (e.nent_cvarname ? e.nent_cvarname : e.nent_name); \
                string notif_msg = sprintf( \
                        "seta notification_%s \"%d\" \"%s\"\n" \
                        "seta notification_%s_ALLOWED \"%d\" \"%s\"\n", \
-                       cvarname, e.nent_default, descriptiona, \
-                       cvarname, e.nent_challow_def, descriptionb \
+                       Get_Notif_CvarName(e), e.nent_default, descriptiona, \
+                       Get_Notif_CvarName(e), e.nent_challow_def, descriptionb \
                ); \
                NOTIF_WRITE(notif_msg); \
        } MACRO_END
@@ -840,7 +833,7 @@ void Dump_Notifications(int fh, bool alsoprint)
 
        int NOTIF_ANNCE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_ANNCE, { ++NOTIF_ANNCE_COUNT; });
        NOTIF_WRITE(sprintf("\n// MSG_ANNCE notifications (count = %d):\n", NOTIF_ANNCE_COUNT));
-       FOREACH(Notifications, it.nent_type == MSG_ANNCE && (!it.nent_teamnum || it.nent_teamnum == 1), {
+       FOREACH(Notifications, it.nent_type == MSG_ANNCE && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
                NOTIF_WRITE_ENTITY(it,
                        "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled"
                );
@@ -848,7 +841,7 @@ void Dump_Notifications(int fh, bool alsoprint)
 
        int NOTIF_INFO_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_INFO, { ++NOTIF_INFO_COUNT; });
        NOTIF_WRITE(sprintf("\n// MSG_INFO notifications (count = %d):\n", NOTIF_INFO_COUNT));
-       FOREACH(Notifications, it.nent_type == MSG_INFO && (!it.nent_teamnum || it.nent_teamnum == 1), {
+       FOREACH(Notifications, it.nent_type == MSG_INFO && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
                NOTIF_WRITE_ENTITY(it,
                        "0 = off, 1 = print to console, "
                        "2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
@@ -857,7 +850,7 @@ void Dump_Notifications(int fh, bool alsoprint)
 
        int NOTIF_CENTER_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CENTER, { ++NOTIF_CENTER_COUNT; });
        NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications (count = %d):\n", NOTIF_CENTER_COUNT));
-       FOREACH(Notifications, it.nent_type == MSG_CENTER && (!it.nent_teamnum || it.nent_teamnum == 1), {
+       FOREACH(Notifications, it.nent_type == MSG_CENTER && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
                NOTIF_WRITE_ENTITY(it,
                        "0 = off, 1 = centerprint"
                );
@@ -865,7 +858,7 @@ void Dump_Notifications(int fh, bool alsoprint)
 
        int NOTIF_MULTI_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_MULTI, { ++NOTIF_MULTI_COUNT; });
        NOTIF_WRITE(sprintf("\n// MSG_MULTI notifications (count = %d):\n", NOTIF_MULTI_COUNT));
-       FOREACH(Notifications, it.nent_type == MSG_MULTI && (!it.nent_teamnum || it.nent_teamnum == 1), {
+       FOREACH(Notifications, it.nent_type == MSG_MULTI && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
                NOTIF_WRITE_ENTITY(it,
                        "Enable this multiple notification"
                );
@@ -873,7 +866,7 @@ void Dump_Notifications(int fh, bool alsoprint)
 
        int NOTIF_CHOICE_COUNT = 0; FOREACH(Notifications, it.nent_type == MSG_CHOICE, { ++NOTIF_CHOICE_COUNT; });
        NOTIF_WRITE(sprintf("\n// MSG_CHOICE notifications (count = %d):\n", NOTIF_CHOICE_COUNT));
-       FOREACH(Notifications, it.nent_type == MSG_CHOICE && (!it.nent_teamnum || it.nent_teamnum == 1), {
+       FOREACH(Notifications, it.nent_type == MSG_CHOICE && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), {
                NOTIF_WRITE_ENTITY_CHOICE(it,
                        "Choice for this notification 0 = off, 1 = default message, 2 = verbose message",
                        "Allow choice for this notification 0 = off, 1 = only in warmup mode, 2 = always"
@@ -1376,8 +1369,7 @@ void Local_Notification(MSG net_type, Notification net_name, ...count)
                {
                        entity found_choice = notif.nent_optiona;
                        if (notif.nent_challow_var && (warmup_stage || (notif.nent_challow_var == 2))) {
-                               string cvarname = (notif.nent_cvarname ? notif.nent_cvarname : notif.nent_name);
-                               switch (cvar(sprintf("notification_%s", cvarname)))
+                               switch (cvar(sprintf("notification_%s", Get_Notif_CvarName(notif))))
                                {
                                        case 1: break;
                                        case 2: found_choice = notif.nent_optionb; break;