From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 12 Apr 2004 07:34:02 +0000 (+0000)
Subject: patch from transfusion team to change transfusion hud layout a bit (moves minideathma... 
X-Git-Tag: xonotic-v0.1.0preview~5924
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=c7d0648ddb1c2dd222b5228d126452739dbfa0b7;p=xonotic%2Fdarkplaces.git

patch from transfusion team to change transfusion hud layout a bit (moves minideathmatch overlay to be across the top of the screen, and centers the sbar even in deathmatch)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4096 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/console.c b/console.c
index 0a193602..b11015c8 100644
--- a/console.c
+++ b/console.c
@@ -653,7 +653,10 @@ void Con_DrawNotify (void)
 		Cvar_SetValueQuick(&con_notify, 0);
 	if (con_notify.integer > MAX_NOTIFYLINES)
 		Cvar_SetValueQuick(&con_notify, MAX_NOTIFYLINES);
-	v = 0;
+	if (gamemode == GAME_TRANSFUSION)
+		v = 8;
+	else
+		v = 0;
 	for (i= con_current-con_notify.integer+1 ; i<=con_current ; i++)
 	{
 		if (i < 0)
diff --git a/sbar.c b/sbar.c
index a1628a45..cb7eb4fc 100644
--- a/sbar.c
+++ b/sbar.c
@@ -1027,7 +1027,7 @@ void Sbar_Draw (void)
 	else // Quake and others
 	{
 		sbar_y = vid.conheight - SBAR_HEIGHT;
-		if (cl.gametype == GAME_DEATHMATCH)
+		if (cl.gametype == GAME_DEATHMATCH && gamemode != GAME_TRANSFUSION)
 			sbar_x = 0;
 		else
 			sbar_x = (vid.conwidth - 320)/2;
@@ -1133,7 +1133,12 @@ void Sbar_Draw (void)
 		}
 
 		if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
-			Sbar_MiniDeathmatchOverlay (324, vid.conheight - sb_lines);
+		{
+			if (gamemode == GAME_TRANSFUSION)
+				Sbar_MiniDeathmatchOverlay (0, 0);
+			else
+				Sbar_MiniDeathmatchOverlay (324, vid.conheight - sb_lines);
+		}
 	}
 
 	Sbar_ShowFPS();
@@ -1217,8 +1222,16 @@ void Sbar_MiniDeathmatchOverlay (int x, int y)
 		i = bound(0, i, scoreboardlines - numlines);
 	}
 
-	for (;i < scoreboardlines && y < vid.conheight;i++)
-		y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
+	if (gamemode == GAME_TRANSFUSION)
+	{
+		for (;i < scoreboardlines && x < vid.conwidth;i++)
+			x += 128 + Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
+	}
+	else
+	{
+		for (;i < scoreboardlines && y < vid.conheight;i++)
+			y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
+	}
 }
 
 /*