From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 5 Oct 2012 23:31:02 +0000 (+0300)
Subject: Properly draw respawn info on a new line
X-Git-Tag: xonotic-v0.7.0~198^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d363eb368a00bc3837c8729014ee50e3e09700a8;p=xonotic%2Fxonotic-data.pk3dir.git

Properly draw respawn info on a new line
---

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 9bcb516a5..c07759fee 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1374,6 +1374,9 @@ void HUD_DrawScoreboard()
 		}
 	}
 
+	pos_y += 1.2 * hud_fontsize_y;
+	drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+
 	// add information about respawn status
 	float respawn_time = getstatf(STAT_RESPAWN_SCHEDULE);
 	if(respawn_time)
@@ -1382,20 +1385,20 @@ void HUD_DrawScoreboard()
 		{
 			// a negative value means we are awaiting respawn, time value is still the same
 			respawn_time *= -1; // remove our mark now that we checked it
-			str = strcat(str, "\n\nRespawning in ", ftos(respawn_time - time), " seconds...");
+			str = strcat("Respawning in ", ftos(respawn_time - time), " seconds...");
 		}
 		else if(time < respawn_time)
 		{
-			str = strcat(str, "\n\nYou are dead, wait ", ftos(respawn_time - time), " seconds before respawning");
+			str = strcat("You are dead, wait ", ftos(respawn_time - time), " seconds before respawning");
 		}
 		else if(time >= respawn_time)
 		{
-			str = strcat(str, "\n\nYou are dead, press fire to respawn");
+			str = strcat("You are dead, press fire to respawn");
 		}
-	}
 
-	pos_y += 1.2 * hud_fontsize_y;
-	drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+		pos_y += 1.2 * hud_fontsize_y;
+		drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
+	}
 
 	scoreboard_bottom = pos_y + 2 * hud_fontsize_y;
 }