Merge branch 'master' into mario/monsters

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 2c25d97ddc30cfb1f219f0c02505ca739e207ee3..cf495153efec43c88f8a4ed6d47ce630cf701742 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -125,9 +125,11 @@ void Destroy_All_Notifications(void)
                        Destroy_Notification_Entity(notif); \
                }
 
-       // kill all networked notifications
+       // kill all networked notifications and centerprints
        #ifdef SVQC
        Kill_Notification(NOTIF_ALL, world, 0, 0);
+       #else
+       reset_centerprint_messages();
        #endif
 
        // kill all real notification entities
@@ -860,18 +862,17 @@ void Local_Notification(float net_type, float net_name, ...count)
 
        entity notif = Get_Notif_Ent(net_type, net_name);
        if not(notif) { backtrace("Local_Notification: Could not find notification entity!\n"); return; }
-
-       #ifdef NOTIFICATIONS_DEBUG
        if not(notif.nent_enabled)
        {
+               #ifdef NOTIFICATIONS_DEBUG
                dprint(sprintf(
                        "Local_Notification(%s, %s): Entity was disabled...\n",
                        Get_Notif_TypeName(net_type),
                        notif.nent_name
                ));
+               #endif
                return;
        }
-       #endif
        
        if((notif.nent_stringcount + notif.nent_floatcount) > count)
        {

diff --git a/qcsrc/common/notifications.qh b/qcsrc/common/notifications.qh
index 38d6e3da2a4e03b69ee41353c910d69c351e813b..a32cc2b426c58e67f7b38776fbd70744d62a40f7 100644 (file)
--- a/qcsrc/common/notifications.qh
+++ b/qcsrc/common/notifications.qh
@@ -322,7 +322,7 @@ void Send_Notification_WOVA(
        MSG_INFO_NOTIF(1, INFO_RACE_NEW_SET,                   1, 2, "s1 race_col f1ord race_col f2race_time", "s1",                  "race_newrecordserver",  _("^BG%s^BG set the %s%s^BG place record with %s%s\n"), "") \
        MULTITEAM_INFO(1, INFO_SCORES_, 4,                     0, 0, "", "",                            "",                     _("^TC^TT ^BGteam scores!\n"), "") \
        MSG_INFO_NOTIF(1, INFO_SPECTATE_WARNING,               0, 1, "f1secs", "",                      "",                     _("^F2You have to become a player within the next %s, otherwise you will be kicked, because spectating isn't allowed at this time!\n"), "") \
-       MSG_INFO_NOTIF(1, INFO_SUPERWEAPON_PICKUP,             0, 0, "s1", "s1",                        "strength",             _("^BG%s^K1 picked up a Superweapon\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_SUPERWEAPON_PICKUP,             1, 0, "s1", "s1",                        "strength",             _("^BG%s^K1 picked up a Superweapon\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_AIM_REMOVE,                      0, 0, "", "",                            "",                     _("^BGYou need to aim at your turret to remove it\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_AIM_REPAIR,                      0, 0, "", "",                            "",                     _("^BGYou need to aim at your turret to repair it\n"), "") \
        MSG_INFO_NOTIF(1, INFO_TD_AIM_UPGRADE,                     0, 0, "", "",                            "",                     _("^BGYou need to aim at your turret to upgrade it\n"), "") \