X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sbar.c;h=95fb089d8c98271c1cfa418034d2d009058f4578;hb=7ef262a7368c32d0e0bf7eb8bf4bbf7c79338bff;hp=809c6044a0b24762fe97d953150e0396003f8aa8;hpb=886dd05c5ec12e07954ebe6ceff05fac41cdfe13;p=xonotic%2Fdarkplaces.git

diff --git a/sbar.c b/sbar.c
index 809c6044..95fb089d 100644
--- a/sbar.c
+++ b/sbar.c
@@ -622,6 +622,45 @@ Sbar_SoloScoreboard
 */
 void Sbar_SoloScoreboard (void)
 {
+#if 1
+	char	str[80], timestr[40];
+	int		i, max;
+	int		minutes, seconds;
+
+	minutes = (int)(cl.time / 60);
+	seconds = (int)(cl.time - 60*floor(cl.time/60));
+
+	// monsters and secrets are now both on the top row
+	if (gamemode != GAME_NEXUIZ)
+		Sbar_DrawString(8, 4, va("Monsters:%3i /%3i    Secrets :%3i /%3i", cl.stats[STAT_MONSTERS], cl.stats[STAT_TOTALMONSTERS], cl.stats[STAT_SECRETS], cl.stats[STAT_TOTALSECRETS]));
+
+	// figure out the map's filename without path or extension
+	strlcpy(str, FS_FileWithoutPath(cl.worldmodel ? cl.worldmodel->name : ""), sizeof(str));
+	if (strrchr(str, '.'))
+		*(strrchr(str, '.')) = 0;
+
+	// append a : separator and then the full title
+	strlcat(str, ":", sizeof(str));
+	strlcat(str, cl.levelname, sizeof(str));
+
+	// make the time string
+	max = 38 - sprintf(timestr, " %i:%02i", minutes, seconds);
+
+	// if there's a newline character, terminate the string there
+	if (strchr(str, '\n'))
+		*(strchr(str, '\n')) = 0;
+
+	// pad with spaces to fill the allotted space and append the time
+	i = bound(0, (int)strlen(str), max);
+	while (i < max)
+		str[i++] = ' ';
+	str[i] = 0;
+	strlcat(str, timestr, sizeof(str));
+
+	// print the line of text
+	Sbar_DrawString(8, 12, str);
+
+#else
 	char	str[80];
 	int		minutes, seconds, tens, units;
 	int		l;
@@ -650,6 +689,7 @@ void Sbar_SoloScoreboard (void)
 		l = (int) strlen (cl.levelname);
 		Sbar_DrawString (232 - l*4, 12, cl.levelname);
 	}
+#endif
 }
 
 /*
@@ -710,7 +750,7 @@ void Sbar_DrawInventory (void)
 		if (cl.stats[STAT_ITEMS] & (IT_SHOTGUN<<i) )
 		{
 			time = cl.item_gettime[i];
-			flashon = (int)((cl.time - time)*10);
+			flashon = (int)(max(0, cl.time - time)*10);
 			if (flashon >= 10)
 			{
 				if ( cl.stats[STAT_ACTIVEWEAPON] == (IT_SHOTGUN<<i)  )
@@ -734,7 +774,7 @@ void Sbar_DrawInventory (void)
 		{
 			if (cl.stats[STAT_ITEMS] & (1<<hipweapons[i]) )
 			{
-				time = cl.item_gettime[hipweapons[i]];
+				time = max(0, cl.item_gettime[hipweapons[i]]);
 				flashon = (int)((cl.time - time)*10);
 				if (flashon >= 10)
 				{
@@ -1122,7 +1162,7 @@ void Sbar_Draw (void)
 				int redflag, blueflag;
 
 				// we have a max time 2s (min time = 0)
-				if ((time = cl.time - cl.weapontime) < 2)
+				if ((time = max(0, cl.time - cl.weapontime)) < 2)
 				{
 					fade = (1.0 - 0.5 * time);
 					fade *= fade;
@@ -1325,7 +1365,7 @@ void Sbar_Draw (void)
 				Sbar_DrawFace ();
 
 				// health
-				Sbar_DrawNum (154, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
+				Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
 
 				// ammo icon
 				if (gamemode == GAME_ROGUE)
@@ -1400,9 +1440,9 @@ float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y)
 		if (s->qw_spectator)
 		{
 			if (s->qw_ping || s->qw_packetloss)
-				DrawQ_ColoredString(x, y, va("%4i %3i %4i spectator  %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes, cl.qw_teamplay ? s->qw_team : "", (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL );
+				DrawQ_ColoredString(x, y, va("%4i %3i %4i spectator  %c%s", bound(0, s->qw_ping, 9999), bound(0, s->qw_packetloss, 99), minutes, (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL );
 			else
-				DrawQ_ColoredString(x, y, va("         %4i spectator  %c%s", minutes, cl.qw_teamplay ? s->qw_team : "", (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL );
+				DrawQ_ColoredString(x, y, va("         %4i spectator  %c%s", minutes, (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha_fg.value, 0, NULL );
 		}
 		else
 		{