From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 31 Aug 2010 20:27:07 +0000 (+0200)
Subject: Revert "change some messages to use sprintf - others are left for someone else to... 
X-Git-Tag: xonotic-v0.1.0preview~320^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3dcc1441c09a804b158b0d5144eeeb9e0773e677;p=xonotic%2Fxonotic-data.pk3dir.git

Revert "change some messages to use sprintf - others are left for someone else to fix" to back out of compile error

This reverts commit d1594f10ba0de020568b7bbd0c6ee05162ac0406.
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 82f080241..e46e5cda4 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, s1));
+			HUD_KillNotify_Push(s1, "", 0, DEATH_KILL);
 			if (alsoprint)
-				print(sprintf("^1%s^1 couldn't take it anymore\n", s1));
+				print ("^1",s1, "^1 couldn't take it anymore\n");
 		} else if (type == DEATH_ROT) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1));
+			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
 			if (alsoprint)
-				print(sprintf("^1%s^1 died\n", s1));
+				print ("^1",s1, "^1 died\n");
 		} else if (type == DEATH_NOAMMO) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO, s1));
+			HUD_KillNotify_Push(s1, "", 0, DEATH_NOAMMO);
 			if (alsoprint)
-				print(sprintf("^7%s^7 committed suicide. What's the point of living without ammo?\n", s1));
+				print ("^7",s1, "^7 committed suicide. What's the point of living without ammo?\n");
 		} else if (type == DEATH_CAMP) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP, s1));
+			HUD_KillNotify_Push(s1, "", 0, DEATH_CAMP);
 			if (alsoprint)
-				print(sprintf("^1%s^1 thought they found a nice camping ground\n", s1));
+				print ("^1",s1, "^1 thought they found a nice camping ground\n");
 		} else if (type == KILL_TEAM_RED || type == KILL_TEAM_BLUE) {
-			HUD_KillNotify_Push(s1, "", 0, type, s1));
+			HUD_KillNotify_Push(s1, "", 0, type);
 			if (alsoprint)
-				print(sprintf("^1%s^1 didn't become friends with the Lord of Teamplay\n", s1));
+				print ("^1",s1, "^1 didn't become friends with the Lord of Teamplay\n");
 		} else if (type == DEATH_CHEAT) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1));
+			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
 			if (alsoprint)
-				print(sprintf("^1%s^1 unfairly eliminated themself\n", s1));
+				print ("^1",s1, "^1 unfairly eliminated themself\n");
 		} else if (type == DEATH_FIRE) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1));
+			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
 			if (alsoprint)
-				print(sprintf("^1%s^1 burned to death\n", s1));
+				print ("^1",s1, "^1 burned to death\n");
 		} else if (type != DEATH_TEAMCHANGE && type != DEATH_QUIET) {
-			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC, s1));
+			HUD_KillNotify_Push(s1, "", 0, DEATH_GENERIC);
 			if (alsoprint)
-				print(sprintf("^1%s^1 couldn't resist the urge to self-destruct\n", s1));
+				print ("^1",s1, "^1 couldn't resist the urge to self-destruct\n");
 		} 
 		
 		if (stof(s2) > 2) // killcount > 2
-			print(sprintf("^1%s^1 ended it all after a %s kill spree\n", s1, s2));
+			print ("^1",s1,"^1 ended it all after a ",s2," kill spree\n");
 	} 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(sprintf("^1%s^1 took action against a team mate\n", s1));
+					print ("^1", s1, "^1 took action against a team mate\n");
 				} else {
-					print(sprintf("^1%s^1 mows down a team mate\n", s1));
+					print ("^1", s1, "^1 mows down a team mate\n");
 				}
 			}
 			if (stof(s2) > 2 && type == KILL_TEAM_SPREE) {