notify messages MOSTLY work... some breakage here and there, please test :/

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 55def58fcbc8ea96581d4b9dbee329711d1d0a9b..538383b4fe6df66e0486d0f7a5cb26d22df5b08a 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -483,14 +483,6 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                                bprint ("^1",s, "^1 was shot into space by ", a, "\n");
                                        else if (deathtype == DEATH_SWAMP)
                                                bprint ("^1",s, "^1 was conserved by ", a, "\n");
-                                       else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
-                                       {
-                                               p = strstrofs(inflictor.message2, "#", 0);
-                                               if(p < 0)
-                                                       bprint("^1", s, "^1 ", inflictor.message2, " ", a, "\n");
-                                               else
-                                                       bprint("^1", s, "^1 ", substring(inflictor.message2, 0, p), a, "^1", substring(inflictor.message2, p+1, strlen(inflictor.message2) - (p+1)), "\n");
-                                       }
                                        else if(deathtype == DEATH_SBCRUSH)
                         bprint ("^1",s, "^1 was crushed by ^1", a, "\n");
                                        else if(deathtype == DEATH_SBMINIGUN)
@@ -526,6 +518,10 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
 
                                        if (deathtype == DEATH_CUSTOM)
                                                msg = strcat(deathmessage, " by ^1", msg);
+                                       else if (deathtype == DEATH_HURTTRIGGER && inflictor.message2 != "")
+                                       {
+                                               msg = strstrofs(inflictor.message2, "#", 0);
+                                       }
                                        Send_KillNotification(s, a, msg, deathtype, MSG_KILL);
                                //}