add Samual's beloved sv_fragmessages

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index bf903bdb05f9b30c3044994795f510364a693c81..f2bb43442eeca9eee36868de65781536616557da 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -1249,7 +1249,7 @@ void Net_Notify() {
        }
        else if(type == CSQC_CENTERPRINT)
        {
-               HUD_Centerprint(ReadString(), ReadShort(), ReadByte());
+               HUD_Centerprint(ReadString(), ReadString(), ReadShort(), ReadByte());
        }
 }
 

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 8a6c174e5be89d4634a80c29a30f78ccdaba924a..6d6d3193adfec279401176685ac6fae243df0389 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2490,7 +2490,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg)
 
 #define DAMAGE_CENTERPRINT_SPACER NEWLINES
 
-void HUD_Centerprint(string s1, float type, float msg)
+void HUD_Centerprint(string s1, string s2, float type, float msg)
 {
        if(msg == MSG_SUICIDE) {
                if (type == DEATH_TEAMCHANGE) {
@@ -2544,29 +2544,29 @@ void HUD_Centerprint(string s1, float type, float msg)
                        } else {
                                centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1First victim"));
                        }
-               } else if (type == KILL_TYPEFRAG) {
+               } else if (type == KILL_TYPEFRAG) { // s2 contains "advanced kill messages" such as ping, handicap...
                        if(cvar("cl_gentle")) {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^7 who was typing!"));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You scored against ^7", s1, "^7 who was typing!", s2));
                        } else {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You typefragged ^7", s1, s2));
                        }
                } else if (type == KILL_TYPEFRAGGED) {
                        if(cvar("cl_gentle")) {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^7 while you were typing!"));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were scored against by ^7", s1, "^7 while you were typing!", s2));
                        } else {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^1You were typefragged by ^7", s1, s2));
                        }
                } else if (type == KILL_FRAG) {
                        if(cvar("cl_gentle")) {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You scored against ^7", s1, s2));
                        } else {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You fragged ^7", s1, s2));
                        }
                } else if (type == KILL_FRAGGED) {
                        if(cvar("cl_gentle")) {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were scored against by ^7", s1));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were scored against by ^7", s1, s2));
                        } else {
-                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were fragged by ^7", s1));
+                               centerprint(strcat(DAMAGE_CENTERPRINT_SPACER, "^4You were fragged by ^7", s1, s2));
                        }
                }
        } else if(msg == MSG_KILL_ACTION) {

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index c544370704594b97b0d8a581c7dab6f25caf17e4..b8e42bdfd5b4a9eb0abad587baaaf74816552ecc 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -259,7 +259,7 @@ void Send_KillNotification (string s1, string s2, string s3, float msg, float ty
 
 // TODO: writespectatable?
 // Function is used to send a generic centerprint whose content CSQC gets to decide (gentle version or not in the below cases)
-void Send_CSQC_Centerprint(entity e, string s1, float msg, float type)
+void Send_CSQC_Centerprint(entity e, string s1, string s2, float msg, float type)
 {
        if (clienttype(e) == CLIENTTYPE_REAL)
        {
@@ -268,6 +268,7 @@ void Send_CSQC_Centerprint(entity e, string s1, float msg, float type)
                WriteByte(MSG_ONE, TE_CSQC_NOTIFY);
                WriteByte(MSG_ONE, CSQC_CENTERPRINT);
                WriteString(MSG_ONE, s1);
+               WriteString(MSG_ONE, s2);
                WriteShort(MSG_ONE, msg);
                WriteByte(MSG_ONE, type);
        }
@@ -291,7 +292,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                {
                        if (deathtype == DEATH_TEAMCHANGE || deathtype == DEATH_AUTOTEAMCHANGE)
                                msg = ColoredTeamName(targ.team); // TODO: check if needed?
-                       Send_CSQC_Centerprint(targ, msg, deathtype, MSG_SUICIDE);
+                       Send_CSQC_Centerprint(targ, msg, "", deathtype, MSG_SUICIDE);
 
                        if(deathtype != DEATH_TEAMCHANGE && deathtype != DEATH_QUIET)
                        {
@@ -336,7 +337,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                attacker.killcount = 0;
 
                                LogDeath("tk", deathtype, attacker, targ);
-                               Send_CSQC_Centerprint(attacker, s, type, MSG_KILL);
+                               Send_CSQC_Centerprint(attacker, s, "", type, MSG_KILL);
                                Send_KillNotification(a, msg, "", type, MSG_KILL);
                        }
                        else
@@ -347,17 +348,18 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                                        checkrules_firstblood = TRUE;
                                        Send_KillNotification(a, "", "", KILL_FIRST_BLOOD, MSG_KILL);
                                        // TODO: make these print at newline if they dont
-                                       Send_CSQC_Centerprint(attacker, "", KILL_FIRST_BLOOD, MSG_KILL);
-                                       Send_CSQC_Centerprint(targ, "", KILL_FIRST_VICTIM, MSG_KILL);
+                                       Send_CSQC_Centerprint(attacker, "", "", KILL_FIRST_BLOOD, MSG_KILL);
+                                       Send_CSQC_Centerprint(targ, "", "", KILL_FIRST_VICTIM, MSG_KILL);
                                }
 
                                if((cvar("sv_fragmessage_information_typefrag")) && (targ.BUTTON_CHAT)) {
-                                       Send_CSQC_Centerprint(attacker, s, KILL_TYPEFRAG, MSG_KILL);
-                                       Send_CSQC_Centerprint(targ, a, KILL_TYPEFRAGGED, MSG_KILL);
+                                       Send_CSQC_Centerprint(attacker, s, GetAdvancedDeathReports(targ), KILL_TYPEFRAG, MSG_KILL);
+                                       Send_CSQC_Centerprint(targ, a, GetAdvancedDeathReports(attacker), KILL_TYPEFRAGGED, MSG_KILL);
                                } else {
-                                       Send_CSQC_Centerprint(attacker, s, KILL_FRAG, MSG_KILL);
-                                       Send_CSQC_Centerprint(targ, a, KILL_FRAGGED, MSG_KILL);
+                                       Send_CSQC_Centerprint(attacker, s, GetAdvancedDeathReports(targ), KILL_FRAG, MSG_KILL);
+                                       Send_CSQC_Centerprint(targ, a, GetAdvancedDeathReports(attacker), KILL_FRAGGED, MSG_KILL);
                                }
+
                                attacker.taunt_soundtime = time + 1;
 
                                // TODO: fix this?
@@ -429,7 +431,7 @@ void Obituary (entity attacker, entity inflictor, entity targ, float deathtype)
                }
                else
                {
-                       Send_CSQC_Centerprint(targ, "", deathtype, MSG_KILL_ACTION);
+                       Send_CSQC_Centerprint(targ, "", "", deathtype, MSG_KILL_ACTION);
                        if (deathtype == DEATH_HURTTRIGGER && inflictor.message != "")
                                msg = inflictor.message;
                        else if (deathtype == DEATH_CUSTOM)