Fix some bugs with teamchange and hurttrigger notification

diff --git a/qcsrc/common/notifications.qc b/qcsrc/common/notifications.qc
index 723c4acb6cc4612e7c6a2fa2319a1b01b83845c0..f6682509b6a7400497eb37610f2309001883fdcd 100644 (file)
--- a/qcsrc/common/notifications.qc
+++ b/qcsrc/common/notifications.qc
@@ -211,10 +211,10 @@ float Form_Score_Pos(entity player)
                                                                                                        NO_STR_ARG,                             XPND2(s1, ""),  "notify_camping", _("^FG%s^K1\n"), "") \
        MSG_DEATH_NOTIF(DEATH_SELF_BETRAYAL,                    0, 0, NO_STR_ARG,               NO_CPID,                _("^K1Don't shoot your team mates!"), _("^K1Don't go against your team mates!"), \
                                                                                                        NO_STR_ARG,                             XPND2("", ""),  "", _("^FG%s^K1\n"), "") \
-       MSG_DEATH_NOTIF(DEATH_SELF_TEAMCHANGE,                  0, 1, DEATH_TEAM,               NO_CPID,                _("^BGYou are now on: %s"), "", \
-                                                                                                       NO_STR_ARG,                             XPND2("", ""),  "", _("^FG%s^K1\n"), "") \
-       MSG_DEATH_NOTIF(DEATH_SELF_AUTOTEAMCHANGE,              0, 1, DEATH_TEAM,               NO_CPID,                _("^BGYou have been moved into a different team\nYou are now on: %s"), "", \
-                                                                                                       NO_STR_ARG,                             XPND2("", ""),  "", _("^FG%s^K1\n"), "") \
+       MSG_DEATH_NOTIF(DEATH_SELF_TEAMCHANGE,                  1, 1, DEATH_TEAM,               NO_CPID,                _("^BGYou are now on: %s"), "", \
+                                                                                                       s1,                                             XPND2("", ""),  "", _("^FG%s^K1 moved to another team\n"), "") \
+       MSG_DEATH_NOTIF(DEATH_SELF_AUTOTEAMCHANGE,              1, 1, DEATH_TEAM,               NO_CPID,                _("^BGYou have been moved into a different team\nYou are now on: %s"), "", \
+                                                                                                       s1,                                             XPND2("", ""),  "", _("^FG%s^K1 automatically moved to another team\n"), "") \
        MSG_DEATH_NOTIF(DEATH_SELF_FALL,                                0, 0, NO_STR_ARG,               NO_CPID,                _("^K1You hit the ground with a crunch!"), "", \
                                                                                                        NO_STR_ARG,                             XPND2("", ""),  "notify_fall", _("^FG%s^K1 hit the ground with a crunch\n"), _("^FG%s^K1 hit the ground with a bit too much force\n")) \
        MSG_DEATH_NOTIF(DEATH_SELF_DROWN,                               1, 0, NO_STR_ARG,               NO_CPID,                _("^K1You couldn't catch your breath in time!"), "", \

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index d2cc9f4643867fdea74e18075c2362476ca6dc4b..c705e2bc144750ac4be9b45f7a3b509ed049c07c 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -378,8 +378,8 @@ void Obituary(entity attacker, entity inflictor, entity targ, float deathtype)
        string  s, a, msg;
        float w, type;
 
-       string s1, s2 = NO_STR_ARG;
-       float f1, f2, f3 = NO_FL_ARG;
+       string s1 = NO_STR_ARG, s2 = NO_STR_ARG;
+       float f1 = NO_FL_ARG, f2 = NO_FL_ARG, f3 = NO_FL_ARG;
        float notif_firstblood;