From d1594f10ba0de020568b7bbd0c6ee05162ac0406 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 31 Aug 2010 22:19:02 +0200 Subject: [PATCH] change some messages to use sprintf - others are left for someone else to fix --- qcsrc/client/hud.qc | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index e46e5cda4..82f080241 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2591,41 +2591,41 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s if (alsoprint) print("^1", sprintf(Weapon_SuicideMessage(type), strcat(s1, "^1")), "\n"); } else if (type == DEATH_KILL) { - HUD_KillNotify_Push(s1, "", 0, DEATH_KILL); + HUD_KillNotify_Push(s1, "", 0, DEATH_KILL, s1)); if (alsoprint) - print ("^1",s1, "^1 couldn't take it anymore\n"); + print(sprintf("^1%s^1 couldn't take it anymore\n", s1)); } else if (type == DEATH_ROT) { - HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1)); if (alsoprint) - print ("^1",s1, "^1 died\n"); + print(sprintf("^1%s^1 died\n", s1)); } else if (type == DEATH_NOAMMO) { - HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO); + HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO, s1)); if (alsoprint) - print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n"); + print(sprintf("^7%s^7 committed suicide. What's the point of living without ammo?\n", s1)); } else if (type == DEATH_CAMP) { - HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP); + HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP, s1)); if (alsoprint) - print ("^1",s1, "^1 thought they found a nice camping ground\n"); + print(sprintf("^1%s^1 thought they found a nice camping ground\n", s1)); } else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) { - HUD_KillNotify_Push(s1, "", 0, type); + HUD_KillNotify_Push(s1, "", 0, type, s1)); if (alsoprint) - print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n"); + print(sprintf("^1%s^1 didn't become friends with the Lord of Teamplay\n", s1)); } else if (type == DEATH_CHEAT) { - HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1)); if (alsoprint) - print ("^1",s1, "^1 unfairly eliminated themself\n"); + print(sprintf("^1%s^1 unfairly eliminated themself\n", s1)); } else if (type == DEATH_FIRE) { - HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1)); if (alsoprint) - print ("^1",s1, "^1 burned to death\n"); + print(sprintf("^1%s^1 burned to death\n", s1)); } else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) { - HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC); + HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1)); if (alsoprint) - print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n"); + print(sprintf("^1%s^1 couldn't resist the urge to self-destruct\n", s1)); } if (stof(s2) > 2) // killcount > 2 - print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n"); + print(sprintf("^1%s^1 ended it all after a %s kill spree\n", s1, s2)); } else if(msg == MSG_KILL) { w = DEATH_WEAPONOF(type); if(WEP_VALID(w)) { @@ -2638,9 +2638,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s if(alsoprint) { if(gentle) { - print ("^1", s1, "^1 took action against a team mate\n"); + print(sprintf("^1%s^1 took action against a team mate\n", s1)); } else { - print ("^1", s1, "^1 mows down a team mate\n"); + print(sprintf("^1%s^1 mows down a team mate\n", s1)); } } if (stof(s2) > 2 && type == KILL_TEAM_SPREE) { -- 2.39.2