]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Use MSG_MULTI for generator destroyed message
authorMario <mario.mario@y7mail.com>
Wed, 6 Mar 2013 20:23:37 +0000 (07:23 +1100)
committerMario <mario.mario@y7mail.com>
Wed, 6 Mar 2013 20:23:37 +0000 (07:23 +1100)
qcsrc/common/notifications.qh
qcsrc/server/mutators/gamemode_td.qc

index e689aeb00238dd5af65a23786d449c16e674fa78..51fdaff01cdd2942ce936300d69989c4385155a9 100644 (file)
@@ -322,7 +322,7 @@ void Send_Notification_WOVA(
        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_TD_GENDESTROYED,                    0, 0, "", "",                            "",                     _("^F1A generator was destroyed!\n"), "") \
+       MSG_INFO_NOTIF(1, INFO_TD_GENDESTROYED,                    0, 0, "", "",                            "",                     _("^K1A generator was destroyed!\n"), "") \
        MSG_INFO_NOTIF(2, INFO_VERSION_BETA,                   2, 0, "s1 s2", "",                       "",                     _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s (beta)^BG, you have ^F2Xonotic %s\n"), "") \
        MSG_INFO_NOTIF(2, INFO_VERSION_OLD,                    2, 0, "s1 s2", "",                       "",                     _("^F4NOTE: ^BGThe server is running ^F1Xonotic %s^BG, you have ^F2Xonotic %s\n"), "") \
        MSG_INFO_NOTIF(2, INFO_VERSION_OUTDATED,               2, 0, "s1 s2", "",                       "",                     _("^F4NOTE: ^F1Xonotic %s^BG is out, and you still have ^F2Xonotic %s^BG - get the update from ^F3http://www.xonotic.org/^BG!\n"), "") \
@@ -604,6 +604,7 @@ void Send_Notification_WOVA(
        MSG_MULTI_NOTIF(1, ITEM_WEAPON_NOAMMO,                   INFO_ITEM_WEAPON_NOAMMO,                   CENTER_ITEM_WEAPON_NOAMMO) \
        MSG_MULTI_NOTIF(1, ITEM_WEAPON_PRIMORSEC,                INFO_ITEM_WEAPON_PRIMORSEC,                CENTER_ITEM_WEAPON_PRIMORSEC) \
        MSG_MULTI_NOTIF(1, ITEM_WEAPON_UNAVAILABLE,              INFO_ITEM_WEAPON_UNAVAILABLE,              CENTER_ITEM_WEAPON_UNAVAILABLE) \
+       MSG_MULTI_NOTIF(1, MULTI_TD_GENDESTROYED,                INFO_TD_GENDESTROYED,                                  CENTER_TD_GENDESTROYED) \
        MSG_MULTI_NOTIF(1, WEAPON_ACCORDEON_MURDER,              INFO_WEAPON_ACCORDEON_MURDER,              NO_MSG) \
        MSG_MULTI_NOTIF(1, WEAPON_ACCORDEON_SUICIDE,             INFO_WEAPON_ACCORDEON_SUICIDE,             CENTER_DEATH_SELF_GENERIC) \
        MSG_MULTI_NOTIF(1, WEAPON_CRYLINK_MURDER,                INFO_WEAPON_CRYLINK_MURDER,                NO_MSG) \
index 702ee1709dd1c2180918cc7b53a7548fb4e7dfaf..de00074b7a1d14476bdfdf7ff4ebb027e6b5268c 100644 (file)
@@ -50,8 +50,7 @@ void td_generator_die()
                
        gendestroyed = TRUE;
        
-       Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_TD_GENDESTROYED);
-       Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_TD_GENDESTROYED);
+       Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_TD_GENDESTROYED);
        
        setmodel(self, "models/onslaught/generator_dead.md3");
        self.solid                      = SOLID_NOT;