From: terencehill <piuntn@gmail.com>
Date: Wed, 2 Mar 2011 08:35:27 +0000 (+0100)
Subject: Fix wrong HUD strings (vote count, flag capture message, kill spree message)
X-Git-Tag: xonotic-v0.5.0~309^2~11^2~10
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=da67e97006134e745988867d0de18e017e7c553f;hp=40d7fcd37b892825d9ff8bf727e45d6ce905f443

Fix wrong HUD strings (vote count, flag capture message, kill spree message)
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 30a925a4f8..6ce72820b8 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -2983,9 +2983,9 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s
 		}
 	} else if(msg == MSG_KILL_ACTION_SPREE) {
 		if(gentle)
-			print (sprintf(_("^1%s^1 needs a restart after a %d scoring spree\n"), s1, stof(s2)));
+			print (sprintf(_("^1%s^1 needs a restart after a %s scoring spree\n"), s1, s2));
 		else
-			print (sprintf(_("^1%s^1 died with a %d kill spree\n"), s1, stof(s2)));
+			print (sprintf(_("^1%s^1 died with a %s kill spree\n"), s1, s2));
 	} else if(msg == MSG_INFO) {
 		if(type == INFO_GOTFLAG) { // here, s2 is the flag name
 			HUD_KillNotify_Push(s1, s2, 0, INFO_GOTFLAG);
@@ -3001,7 +3001,7 @@ void HUD_KillNotify(string s1, string s2, string s3, float type, float msg) // s
 			print(sprintf(_("%s^7 returned the %s\n"), s1, s2));
 		} else if(type == INFO_CAPTUREFLAG) {
 			HUD_KillNotify_Push(s1, s2, 0, INFO_CAPTUREFLAG);
-			print(sprintf(_("%1^7 captured the %s%s\n"), s1, s2, s3));
+			print(sprintf(_("%s^7 captured the %s%s\n"), s1, s2, s3));
 		}
 	} else if(msg == MSG_RACE) {
 		if(type == RACE_SERVER_RECORD) {
@@ -3981,9 +3981,9 @@ void HUD_VoteWindow(void)
 	drawcolorcodedstring_aspect(pos + eY * (2/8) * mySize_y, s, eX * mySize_x + eY * (1.75/8) * mySize_y, a, DRAWFLAG_NORMAL);
 
 	// print the yes/no counts
-    s = sprintf(_("Yes (%s): %d"), getcommandkey("vyes", "vyes"), ftos(vote_yescount));
+    s = sprintf(_("Yes (%s): %d"), getcommandkey("vyes", "vyes"), vote_yescount);
 	drawstring_aspect(pos + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '0 1 0', a, DRAWFLAG_NORMAL);
-    s = sprintf(_("No (%s): %d"), getcommandkey("vno", "vno"), ftos(vote_nocount));
+    s = sprintf(_("No (%s): %d"), getcommandkey("vno", "vno"), vote_nocount);
 	drawstring_aspect(pos + eX * 0.5 * mySize_x + eY * (4/8) * mySize_y, s, eX * 0.5 * mySize_x + eY * (1.5/8) * mySize_y, '1 0 0', a, DRAWFLAG_NORMAL);
 
 	// draw the progress bar backgrounds