From ba367013e7ba6c031ba770d352898f4740c7d7c2 Mon Sep 17 00:00:00 2001 From: terencehill Date: Sat, 1 Oct 2022 01:02:25 +0200 Subject: [PATCH] Don't write notification count to file: it's useless and often causes merge conflicts --- notifications.cfg | 12 +++++------- qcsrc/common/notifications/all.qc | 19 ++++++++----------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/notifications.cfg b/notifications.cfg index 9088d8eaf..5a31635fb 100644 --- a/notifications.cfg +++ b/notifications.cfg @@ -11,7 +11,7 @@ // ** ** // // ********************************************** // -// MSG_ANNCE notifications (count = 80): +// MSG_ANNCE notifications: seta notification_ANNCE_ACHIEVEMENT_AIRSHOT "1" "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled" seta notification_ANNCE_ACHIEVEMENT_AMAZING "1" "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled" seta notification_ANNCE_ACHIEVEMENT_AWESOME "1" "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled" @@ -93,7 +93,7 @@ seta notification_ANNCE_VOTE_ACCEPT "2" "0 = disabled, 1 = enabled if gentle mod seta notification_ANNCE_VOTE_CALL "2" "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled" seta notification_ANNCE_VOTE_FAIL "2" "0 = disabled, 1 = enabled if gentle mode is off, 2 = always enabled" -// MSG_INFO notifications (count = 337): +// MSG_INFO notifications: seta notification_INFO_CA_JOIN_LATE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_CA_LEAVE "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_CHAT_NOSPECTATORS "2" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" @@ -345,7 +345,7 @@ seta notification_INFO_WEAPON_TUBA_SUICIDE "1" "0 = off, 1 = print to console, 2 seta notification_INFO_WEAPON_VAPORIZER_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" seta notification_INFO_WEAPON_VORTEX_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)" -// MSG_CENTER notifications (count = 243): +// MSG_CENTER notifications: seta notification_CENTER_ALONE "1" "0 = off, 1 = centerprint" seta notification_CENTER_ASSAULT_ATTACKING "1" "0 = off, 1 = centerprint" seta notification_CENTER_ASSAULT_DEFENDING "1" "0 = off, 1 = centerprint" @@ -542,7 +542,7 @@ seta notification_CENTER_VEHICLE_STEAL "1" "0 = off, 1 = centerprint" seta notification_CENTER_VEHICLE_STEAL_SELF "1" "0 = off, 1 = centerprint" seta notification_CENTER_WEAPON_MINELAYER_LIMIT "1" "0 = off, 1 = centerprint" -// MSG_MULTI notifications (count = 158): +// MSG_MULTI notifications: seta notification_COUNTDOWN_BEGIN "1" "Enable this multiple notification" seta notification_COUNTDOWN_STOP "1" "Enable this multiple notification" seta notification_DEATH_MURDER_BUFF "1" "Enable this multiple notification" @@ -702,7 +702,7 @@ seta notification_WEAPON_TUBA_SUICIDE "1" "Enable this multiple notification" seta notification_WEAPON_VAPORIZER_MURDER "1" "Enable this multiple notification" seta notification_WEAPON_VORTEX_MURDER "1" "Enable this multiple notification" -// MSG_CHOICE notifications (count = 28): +// MSG_CHOICE notifications: seta notification_CHOICE_CTF_CAPTURE_BROKEN "2" "Choice for this notification 0 = off, 1 = default message, 2 = verbose message" seta notification_CHOICE_CTF_CAPTURE_BROKEN_ALLOWED "2" "Allow choice for this notification 0 = off, 1 = only in warmup mode, 2 = always" seta notification_CHOICE_CTF_CAPTURE_TIME "2" "Choice for this notification 0 = off, 1 = default message, 2 = verbose message" @@ -752,5 +752,3 @@ seta notification_show_sprees_center_specialonly "1" "Don't show spree informati seta notification_show_sprees_info "3" "Show spree information in MSG_INFO messages... 0 = off, 1 = target only, 2 = attacker only, 3 = target and attacker" seta notification_show_sprees_info_newline "1" "Show attacker spree information for MSG_INFO messages on a separate line than the death notification itself" seta notification_show_sprees_info_specialonly "1" "Don't show attacker spree information in MSG_INFO messages if it isn't an achievement" - -// Notification counts (total = 846): MSG_ANNCE = 80, MSG_INFO = 337, MSG_CENTER = 243, MSG_MULTI = 158, MSG_CHOICE = 28 diff --git a/qcsrc/common/notifications/all.qc b/qcsrc/common/notifications/all.qc index e6fe8df76..98b0f18e1 100644 --- a/qcsrc/common/notifications/all.qc +++ b/qcsrc/common/notifications/all.qc @@ -838,14 +838,14 @@ void Dump_Notifications(int fh, bool alsoprint) } }); - NOTIF_WRITE(sprintf("\n// MSG_ANNCE notifications (count = %d):\n", NOTIF_ANNCE_COUNT)); + NOTIF_WRITE(sprintf("\n// MSG_ANNCE notifications:\n")); 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" ); }); - NOTIF_WRITE(sprintf("\n// MSG_INFO notifications (count = %d):\n", NOTIF_INFO_COUNT)); + NOTIF_WRITE(sprintf("\n// MSG_INFO notifications:\n")); 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, " @@ -853,21 +853,21 @@ void Dump_Notifications(int fh, bool alsoprint) ); }); - NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications (count = %d):\n", NOTIF_CENTER_COUNT)); + NOTIF_WRITE(sprintf("\n// MSG_CENTER notifications:\n")); FOREACH(Notifications, it.nent_type == MSG_CENTER && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), { NOTIF_WRITE_ENTITY(it, "0 = off, 1 = centerprint" ); }); - NOTIF_WRITE(sprintf("\n// MSG_MULTI notifications (count = %d):\n", NOTIF_MULTI_COUNT)); + NOTIF_WRITE(sprintf("\n// MSG_MULTI notifications:\n")); FOREACH(Notifications, it.nent_type == MSG_MULTI && (!it.nent_teamnum || it.nent_teamnum == NUM_TEAM_1), { NOTIF_WRITE_ENTITY(it, "Enable this multiple notification" ); }); - NOTIF_WRITE(sprintf("\n// MSG_CHOICE notifications (count = %d):\n", NOTIF_CHOICE_COUNT)); + NOTIF_WRITE(sprintf("\n// MSG_CHOICE notifications:\n")); 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", @@ -962,11 +962,8 @@ void Dump_Notifications(int fh, bool alsoprint) "Don't show attacker spree information in MSG_INFO messages if it isn't an achievement" ); - NOTIF_WRITE(sprintf( - ( - "\n// Notification counts (total = %d): " - "MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d\n" - ), + LOG_INFOF("Notification counts (total = %d): " + "MSG_ANNCE = %d, MSG_INFO = %d, MSG_CENTER = %d, MSG_MULTI = %d, MSG_CHOICE = %d\n", ( NOTIF_ANNCE_COUNT + NOTIF_INFO_COUNT + @@ -979,7 +976,7 @@ void Dump_Notifications(int fh, bool alsoprint) NOTIF_CENTER_COUNT, NOTIF_MULTI_COUNT, NOTIF_CHOICE_COUNT - )); + ); #undef NOTIF_WRITE_HARDCODED #undef NOTIF_WRITE_ENTITY #undef NOTIF_WRITE -- 2.39.2