X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sbar.c;h=a1628a456c9213d62f2a4aae40bacbd68a898438;hb=50179cc6a7fa538adf02e37077776a556e6ba63e;hp=683fcd3d22d6af0da1846c5dbe3b90d8dc89ef2d;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;p=xonotic%2Fdarkplaces.git

diff --git a/sbar.c b/sbar.c
index 683fcd3d..a1628a45 100644
--- a/sbar.c
+++ b/sbar.c
@@ -23,35 +23,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 typedef struct
 {
-	char name[16];
-	qpic_t *qpic;
+	char name[32];
 }
 sbarpic_t;
 
 static sbarpic_t sbarpics[256];
 static int numsbarpics;
 
-static sbarpic_t *Sbar_NewPic(char *name)
+static sbarpic_t *Sbar_NewPic(const char *name)
 {
 	strcpy(sbarpics[numsbarpics].name, name);
-	sbarpics[numsbarpics].qpic = NULL;
+	// precache it
+	// FIXME: precache on every renderer restart (or move this to client)
+	Draw_CachePic(sbarpics[numsbarpics].name);
 	return sbarpics + (numsbarpics++);
 }
 
-static qpic_t *Sbar_GetQPic(sbarpic_t *p)
-{
-	if (!p->qpic)
-		p->qpic = Draw_CachePic(p->name);
-	return p->qpic;
-}
-
-static void Sbar_ClearPics(void)
-{
-	int i;
-	for (i = 0;i < numsbarpics;i++)
-		sbarpics[i].qpic = NULL;
-}
-
 sbarpic_t *sb_disc;
 
 #define STAT_MINUS 10 // num frame for '-' stats digit
@@ -60,16 +47,20 @@ sbarpic_t *sb_colon, *sb_slash;
 sbarpic_t *sb_ibar;
 sbarpic_t *sb_sbar;
 sbarpic_t *sb_scorebar;
+// AK only used by NEX
+sbarpic_t *sb_sbar_minimal;
+sbarpic_t *sb_sbar_overlay;
 
-sbarpic_t *sb_weapons[7][8]; // 0 is active, 1 is owned, 2-5 are flashes
+// AK changed the bound to 9
+sbarpic_t *sb_weapons[7][9]; // 0 is active, 1 is owned, 2-5 are flashes
 sbarpic_t *sb_ammo[4];
 sbarpic_t *sb_sigil[4];
 sbarpic_t *sb_armor[3];
 sbarpic_t *sb_items[32];
 
-// 0 is gibbed, 1 is dead, 2-6 are alive
+// 0-4 are based on health (in 20 increments)
 // 0 is static, 1 is temporary animation
-sbarpic_t *sb_faces[7][2];
+sbarpic_t *sb_faces[5][2];
 
 sbarpic_t *sb_face_invis;
 sbarpic_t *sb_face_quad;
@@ -93,8 +84,23 @@ int hipweapons[4] = {HIT_LASER_CANNON_BIT,HIT_MJOLNIR_BIT,4,HIT_PROXIMITY_GUN_BI
 //MED 01/04/97 added hipnotic items array
 sbarpic_t *hsb_items[2];
 
-void Sbar_MiniDeathmatchOverlay (void);
+//GAME_SOM stuff:
+sbarpic_t *somsb_health;
+sbarpic_t *somsb_ammo[4];
+sbarpic_t *somsb_armor[3];
+
+cvar_t	showfps = {CVAR_SAVE, "showfps", "0"};
+cvar_t	showtime = {CVAR_SAVE, "showtime", "0"};
+cvar_t	showtime_format = {CVAR_SAVE, "showtime_format", "%H:%M:%S"};
+cvar_t	showdate = {CVAR_SAVE, "showdate", "0"};
+cvar_t	showdate_format = {CVAR_SAVE, "showdate_format", "%Y-%m-%d"};
+cvar_t	sbar_alpha = {CVAR_SAVE, "sbar_alpha", "1"};
+
+void Sbar_MiniDeathmatchOverlay (int x, int y);
 void Sbar_DeathmatchOverlay (void);
+void Sbar_IntermissionOverlay (void);
+void Sbar_FinaleOverlay (void);
+
 
 /*
 ===============
@@ -123,164 +129,195 @@ void Sbar_DontShowScores (void)
 }
 
 void sbar_start(void)
-{
-	Sbar_ClearPics();
-}
-
-void sbar_shutdown(void)
-{
-	Sbar_ClearPics();
-}
-
-void sbar_newmap(void)
-{
-}
-
-/*
-===============
-Sbar_Init
-===============
-*/
-void Sbar_Init (void)
 {
 	int i;
 
-	Cmd_AddCommand ("+showscores", Sbar_ShowScores);
-	Cmd_AddCommand ("-showscores", Sbar_DontShowScores);
-
 	numsbarpics = 0;
 
-	sb_disc = Sbar_NewPic("disc");
+	sb_disc = Sbar_NewPic("gfx/disc");
 
-	for (i=0 ; i<10 ; i++)
+	for (i = 0;i < 10;i++)
 	{
-		sb_nums[0][i] = Sbar_NewPic (va("num_%i",i));
-		sb_nums[1][i] = Sbar_NewPic (va("anum_%i",i));
+		sb_nums[0][i] = Sbar_NewPic (va("gfx/num_%i",i));
+		sb_nums[1][i] = Sbar_NewPic (va("gfx/anum_%i",i));
 	}
 
-	sb_nums[0][10] = Sbar_NewPic ("num_minus");
-	sb_nums[1][10] = Sbar_NewPic ("anum_minus");
-
-	sb_colon = Sbar_NewPic ("num_colon");
-	sb_slash = Sbar_NewPic ("num_slash");
-
-	sb_weapons[0][0] = Sbar_NewPic ("inv_shotgun");
-	sb_weapons[0][1] = Sbar_NewPic ("inv_sshotgun");
-	sb_weapons[0][2] = Sbar_NewPic ("inv_nailgun");
-	sb_weapons[0][3] = Sbar_NewPic ("inv_snailgun");
-	sb_weapons[0][4] = Sbar_NewPic ("inv_rlaunch");
-	sb_weapons[0][5] = Sbar_NewPic ("inv_srlaunch");
-	sb_weapons[0][6] = Sbar_NewPic ("inv_lightng");
-
-	sb_weapons[1][0] = Sbar_NewPic ("inv2_shotgun");
-	sb_weapons[1][1] = Sbar_NewPic ("inv2_sshotgun");
-	sb_weapons[1][2] = Sbar_NewPic ("inv2_nailgun");
-	sb_weapons[1][3] = Sbar_NewPic ("inv2_snailgun");
-	sb_weapons[1][4] = Sbar_NewPic ("inv2_rlaunch");
-	sb_weapons[1][5] = Sbar_NewPic ("inv2_srlaunch");
-	sb_weapons[1][6] = Sbar_NewPic ("inv2_lightng");
-
-	for (i=0 ; i<5 ; i++)
+	sb_nums[0][10] = Sbar_NewPic ("gfx/num_minus");
+	sb_nums[1][10] = Sbar_NewPic ("gfx/anum_minus");
+
+	sb_colon = Sbar_NewPic ("gfx/num_colon");
+	sb_slash = Sbar_NewPic ("gfx/num_slash");
+
+	if (gamemode == GAME_SOM)
 	{
-		sb_weapons[2+i][0] = Sbar_NewPic (va("inva%i_shotgun",i+1));
-		sb_weapons[2+i][1] = Sbar_NewPic (va("inva%i_sshotgun",i+1));
-		sb_weapons[2+i][2] = Sbar_NewPic (va("inva%i_nailgun",i+1));
-		sb_weapons[2+i][3] = Sbar_NewPic (va("inva%i_snailgun",i+1));
-		sb_weapons[2+i][4] = Sbar_NewPic (va("inva%i_rlaunch",i+1));
-		sb_weapons[2+i][5] = Sbar_NewPic (va("inva%i_srlaunch",i+1));
-		sb_weapons[2+i][6] = Sbar_NewPic (va("inva%i_lightng",i+1));
+		somsb_health = Sbar_NewPic("gfx/hud_health");
+		somsb_ammo[0] = Sbar_NewPic("gfx/sb_shells");
+		somsb_ammo[1] = Sbar_NewPic("gfx/sb_nails");
+		somsb_ammo[2] = Sbar_NewPic("gfx/sb_rocket");
+		somsb_ammo[3] = Sbar_NewPic("gfx/sb_cells");
+		somsb_armor[0] = Sbar_NewPic("gfx/sb_armor1");
+		somsb_armor[1] = Sbar_NewPic("gfx/sb_armor2");
+		somsb_armor[2] = Sbar_NewPic("gfx/sb_armor3");
 	}
-
-	sb_ammo[0] = Sbar_NewPic ("sb_shells");
-	sb_ammo[1] = Sbar_NewPic ("sb_nails");
-	sb_ammo[2] = Sbar_NewPic ("sb_rocket");
-	sb_ammo[3] = Sbar_NewPic ("sb_cells");
-
-	sb_armor[0] = Sbar_NewPic ("sb_armor1");
-	sb_armor[1] = Sbar_NewPic ("sb_armor2");
-	sb_armor[2] = Sbar_NewPic ("sb_armor3");
-
-	sb_items[0] = Sbar_NewPic ("sb_key1");
-	sb_items[1] = Sbar_NewPic ("sb_key2");
-	sb_items[2] = Sbar_NewPic ("sb_invis");
-	sb_items[3] = Sbar_NewPic ("sb_invuln");
-	sb_items[4] = Sbar_NewPic ("sb_suit");
-	sb_items[5] = Sbar_NewPic ("sb_quad");
-
-	sb_sigil[0] = Sbar_NewPic ("sb_sigil1");
-	sb_sigil[1] = Sbar_NewPic ("sb_sigil2");
-	sb_sigil[2] = Sbar_NewPic ("sb_sigil3");
-	sb_sigil[3] = Sbar_NewPic ("sb_sigil4");
-
-	sb_faces[4][0] = Sbar_NewPic ("face1");
-	sb_faces[4][1] = Sbar_NewPic ("face_p1");
-	sb_faces[3][0] = Sbar_NewPic ("face2");
-	sb_faces[3][1] = Sbar_NewPic ("face_p2");
-	sb_faces[2][0] = Sbar_NewPic ("face3");
-	sb_faces[2][1] = Sbar_NewPic ("face_p3");
-	sb_faces[1][0] = Sbar_NewPic ("face4");
-	sb_faces[1][1] = Sbar_NewPic ("face_p4");
-	sb_faces[0][0] = Sbar_NewPic ("face5");
-	sb_faces[0][1] = Sbar_NewPic ("face_p5");
-
-	sb_face_invis = Sbar_NewPic ("face_invis");
-	sb_face_invuln = Sbar_NewPic ("face_invul2");
-	sb_face_invis_invuln = Sbar_NewPic ("face_inv2");
-	sb_face_quad = Sbar_NewPic ("face_quad");
-
-	sb_sbar = Sbar_NewPic ("sbar");
-	sb_ibar = Sbar_NewPic ("ibar");
-	sb_scorebar = Sbar_NewPic ("scorebar");
-
-//MED 01/04/97 added new hipnotic weapons
-	if (gamemode == GAME_HIPNOTIC)
+	else if (gamemode == GAME_NEXUIZ)
 	{
-		hsb_weapons[0][0] = Sbar_NewPic ("inv_laser");
-		hsb_weapons[0][1] = Sbar_NewPic ("inv_mjolnir");
-		hsb_weapons[0][2] = Sbar_NewPic ("inv_gren_prox");
-		hsb_weapons[0][3] = Sbar_NewPic ("inv_prox_gren");
-		hsb_weapons[0][4] = Sbar_NewPic ("inv_prox");
-
-		hsb_weapons[1][0] = Sbar_NewPic ("inv2_laser");
-		hsb_weapons[1][1] = Sbar_NewPic ("inv2_mjolnir");
-		hsb_weapons[1][2] = Sbar_NewPic ("inv2_gren_prox");
-		hsb_weapons[1][3] = Sbar_NewPic ("inv2_prox_gren");
-		hsb_weapons[1][4] = Sbar_NewPic ("inv2_prox");
-
-		for (i=0 ; i<5 ; i++)
+		sb_ammo[0] = Sbar_NewPic ("gfx/sb_shells");
+		sb_ammo[1] = Sbar_NewPic ("gfx/sb_bullets");
+		sb_ammo[2] = Sbar_NewPic ("gfx/sb_rocket");
+		sb_ammo[3] = Sbar_NewPic ("gfx/sb_cells");
+
+		sb_items[2] = Sbar_NewPic ("gfx/sb_slowmo");
+		sb_items[3] = Sbar_NewPic ("gfx/sb_invinc");
+		sb_items[4] = Sbar_NewPic ("gfx/sb_energy");
+		sb_items[5] = Sbar_NewPic ("gfx/sb_str");
+
+		sb_sbar = Sbar_NewPic("gfx/sbar");
+		sb_sbar_minimal = Sbar_NewPic("gfx/sbar_minimal");
+		sb_sbar_overlay = Sbar_NewPic("gfx/sbar_overlay");
+
+		for(i = 0; i < 9;i++)
+			sb_weapons[0][i] = Sbar_NewPic(va("gfx/inv_weapon%i",i));
+	}
+	else
+	{
+		sb_weapons[0][0] = Sbar_NewPic ("gfx/inv_shotgun");
+		sb_weapons[0][1] = Sbar_NewPic ("gfx/inv_sshotgun");
+		sb_weapons[0][2] = Sbar_NewPic ("gfx/inv_nailgun");
+		sb_weapons[0][3] = Sbar_NewPic ("gfx/inv_snailgun");
+		sb_weapons[0][4] = Sbar_NewPic ("gfx/inv_rlaunch");
+		sb_weapons[0][5] = Sbar_NewPic ("gfx/inv_srlaunch");
+		sb_weapons[0][6] = Sbar_NewPic ("gfx/inv_lightng");
+	
+		sb_weapons[1][0] = Sbar_NewPic ("gfx/inv2_shotgun");
+		sb_weapons[1][1] = Sbar_NewPic ("gfx/inv2_sshotgun");
+		sb_weapons[1][2] = Sbar_NewPic ("gfx/inv2_nailgun");
+		sb_weapons[1][3] = Sbar_NewPic ("gfx/inv2_snailgun");
+		sb_weapons[1][4] = Sbar_NewPic ("gfx/inv2_rlaunch");
+		sb_weapons[1][5] = Sbar_NewPic ("gfx/inv2_srlaunch");
+		sb_weapons[1][6] = Sbar_NewPic ("gfx/inv2_lightng");
+	
+		for (i = 0;i < 5;i++)
 		{
-			hsb_weapons[2+i][0] = Sbar_NewPic (va("inva%i_laser",i+1));
-			hsb_weapons[2+i][1] = Sbar_NewPic (va("inva%i_mjolnir",i+1));
-			hsb_weapons[2+i][2] = Sbar_NewPic (va("inva%i_gren_prox",i+1));
-			hsb_weapons[2+i][3] = Sbar_NewPic (va("inva%i_prox_gren",i+1));
-			hsb_weapons[2+i][4] = Sbar_NewPic (va("inva%i_prox",i+1));
+			sb_weapons[2+i][0] = Sbar_NewPic (va("gfx/inva%i_shotgun",i+1));
+			sb_weapons[2+i][1] = Sbar_NewPic (va("gfx/inva%i_sshotgun",i+1));
+			sb_weapons[2+i][2] = Sbar_NewPic (va("gfx/inva%i_nailgun",i+1));
+			sb_weapons[2+i][3] = Sbar_NewPic (va("gfx/inva%i_snailgun",i+1));
+			sb_weapons[2+i][4] = Sbar_NewPic (va("gfx/inva%i_rlaunch",i+1));
+			sb_weapons[2+i][5] = Sbar_NewPic (va("gfx/inva%i_srlaunch",i+1));
+			sb_weapons[2+i][6] = Sbar_NewPic (va("gfx/inva%i_lightng",i+1));
+		}
+	
+		sb_ammo[0] = Sbar_NewPic ("gfx/sb_shells");
+		sb_ammo[1] = Sbar_NewPic ("gfx/sb_nails");
+		sb_ammo[2] = Sbar_NewPic ("gfx/sb_rocket");
+		sb_ammo[3] = Sbar_NewPic ("gfx/sb_cells");
+	
+		sb_armor[0] = Sbar_NewPic ("gfx/sb_armor1");
+		sb_armor[1] = Sbar_NewPic ("gfx/sb_armor2");
+		sb_armor[2] = Sbar_NewPic ("gfx/sb_armor3");
+	
+		sb_items[0] = Sbar_NewPic ("gfx/sb_key1");
+		sb_items[1] = Sbar_NewPic ("gfx/sb_key2");
+		sb_items[2] = Sbar_NewPic ("gfx/sb_invis");
+		sb_items[3] = Sbar_NewPic ("gfx/sb_invuln");
+		sb_items[4] = Sbar_NewPic ("gfx/sb_suit");
+		sb_items[5] = Sbar_NewPic ("gfx/sb_quad");
+	
+		sb_sigil[0] = Sbar_NewPic ("gfx/sb_sigil1");
+		sb_sigil[1] = Sbar_NewPic ("gfx/sb_sigil2");
+		sb_sigil[2] = Sbar_NewPic ("gfx/sb_sigil3");
+		sb_sigil[3] = Sbar_NewPic ("gfx/sb_sigil4");
+	
+		sb_faces[4][0] = Sbar_NewPic ("gfx/face1");
+		sb_faces[4][1] = Sbar_NewPic ("gfx/face_p1");
+		sb_faces[3][0] = Sbar_NewPic ("gfx/face2");
+		sb_faces[3][1] = Sbar_NewPic ("gfx/face_p2");
+		sb_faces[2][0] = Sbar_NewPic ("gfx/face3");
+		sb_faces[2][1] = Sbar_NewPic ("gfx/face_p3");
+		sb_faces[1][0] = Sbar_NewPic ("gfx/face4");
+		sb_faces[1][1] = Sbar_NewPic ("gfx/face_p4");
+		sb_faces[0][0] = Sbar_NewPic ("gfx/face5");
+		sb_faces[0][1] = Sbar_NewPic ("gfx/face_p5");
+	
+		sb_face_invis = Sbar_NewPic ("gfx/face_invis");
+		sb_face_invuln = Sbar_NewPic ("gfx/face_invul2");
+		sb_face_invis_invuln = Sbar_NewPic ("gfx/face_inv2");
+		sb_face_quad = Sbar_NewPic ("gfx/face_quad");
+	
+		sb_sbar = Sbar_NewPic ("gfx/sbar");
+		sb_ibar = Sbar_NewPic ("gfx/ibar");
+		sb_scorebar = Sbar_NewPic ("gfx/scorebar");
+	
+	//MED 01/04/97 added new hipnotic weapons
+		if (gamemode == GAME_HIPNOTIC)
+		{
+			hsb_weapons[0][0] = Sbar_NewPic ("gfx/inv_laser");
+			hsb_weapons[0][1] = Sbar_NewPic ("gfx/inv_mjolnir");
+			hsb_weapons[0][2] = Sbar_NewPic ("gfx/inv_gren_prox");
+			hsb_weapons[0][3] = Sbar_NewPic ("gfx/inv_prox_gren");
+			hsb_weapons[0][4] = Sbar_NewPic ("gfx/inv_prox");
+	
+			hsb_weapons[1][0] = Sbar_NewPic ("gfx/inv2_laser");
+			hsb_weapons[1][1] = Sbar_NewPic ("gfx/inv2_mjolnir");
+			hsb_weapons[1][2] = Sbar_NewPic ("gfx/inv2_gren_prox");
+			hsb_weapons[1][3] = Sbar_NewPic ("gfx/inv2_prox_gren");
+			hsb_weapons[1][4] = Sbar_NewPic ("gfx/inv2_prox");
+	
+			for (i = 0;i < 5;i++)
+			{
+				hsb_weapons[2+i][0] = Sbar_NewPic (va("gfx/inva%i_laser",i+1));
+				hsb_weapons[2+i][1] = Sbar_NewPic (va("gfx/inva%i_mjolnir",i+1));
+				hsb_weapons[2+i][2] = Sbar_NewPic (va("gfx/inva%i_gren_prox",i+1));
+				hsb_weapons[2+i][3] = Sbar_NewPic (va("gfx/inva%i_prox_gren",i+1));
+				hsb_weapons[2+i][4] = Sbar_NewPic (va("gfx/inva%i_prox",i+1));
+			}
+	
+			hsb_items[0] = Sbar_NewPic ("gfx/sb_wsuit");
+			hsb_items[1] = Sbar_NewPic ("gfx/sb_eshld");
+		}
+		else if (gamemode == GAME_ROGUE)
+		{
+			rsb_invbar[0] = Sbar_NewPic ("gfx/r_invbar1");
+			rsb_invbar[1] = Sbar_NewPic ("gfx/r_invbar2");
+	
+			rsb_weapons[0] = Sbar_NewPic ("gfx/r_lava");
+			rsb_weapons[1] = Sbar_NewPic ("gfx/r_superlava");
+			rsb_weapons[2] = Sbar_NewPic ("gfx/r_gren");
+			rsb_weapons[3] = Sbar_NewPic ("gfx/r_multirock");
+			rsb_weapons[4] = Sbar_NewPic ("gfx/r_plasma");
+	
+			rsb_items[0] = Sbar_NewPic ("gfx/r_shield1");
+			rsb_items[1] = Sbar_NewPic ("gfx/r_agrav1");
+	
+	// PGM 01/19/97 - team color border
+			rsb_teambord = Sbar_NewPic ("gfx/r_teambord");
+	// PGM 01/19/97 - team color border
+	
+			rsb_ammo[0] = Sbar_NewPic ("gfx/r_ammolava");
+			rsb_ammo[1] = Sbar_NewPic ("gfx/r_ammomulti");
+			rsb_ammo[2] = Sbar_NewPic ("gfx/r_ammoplasma");
 		}
-
-		hsb_items[0] = Sbar_NewPic ("sb_wsuit");
-		hsb_items[1] = Sbar_NewPic ("sb_eshld");
 	}
-	else if (gamemode == GAME_ROGUE)
-	{
-		rsb_invbar[0] = Sbar_NewPic ("r_invbar1");
-		rsb_invbar[1] = Sbar_NewPic ("r_invbar2");
-
-		rsb_weapons[0] = Sbar_NewPic ("r_lava");
-		rsb_weapons[1] = Sbar_NewPic ("r_superlava");
-		rsb_weapons[2] = Sbar_NewPic ("r_gren");
-		rsb_weapons[3] = Sbar_NewPic ("r_multirock");
-		rsb_weapons[4] = Sbar_NewPic ("r_plasma");
+}
 
-		rsb_items[0] = Sbar_NewPic ("r_shield1");
-		rsb_items[1] = Sbar_NewPic ("r_agrav1");
+void sbar_shutdown(void)
+{
+}
 
-// PGM 01/19/97 - team color border
-		rsb_teambord = Sbar_NewPic ("r_teambord");
-// PGM 01/19/97 - team color border
+void sbar_newmap(void)
+{
+}
 
-		rsb_ammo[0] = Sbar_NewPic ("r_ammolava");
-		rsb_ammo[1] = Sbar_NewPic ("r_ammomulti");
-		rsb_ammo[2] = Sbar_NewPic ("r_ammoplasma");
-	}
+void Sbar_Init (void)
+{
+	Cmd_AddCommand ("+showscores", Sbar_ShowScores);
+	Cmd_AddCommand ("-showscores", Sbar_DontShowScores);
+	Cvar_RegisterVariable (&showfps);
+	Cvar_RegisterVariable (&showtime);
+	Cvar_RegisterVariable (&showtime_format);
+	Cvar_RegisterVariable (&showdate);
+	Cvar_RegisterVariable (&showdate_format);
+	Cvar_RegisterVariable (&sbar_alpha);
 
 	R_RegisterModule("sbar", sbar_start, sbar_shutdown, sbar_newmap);
 }
@@ -299,13 +336,12 @@ Sbar_DrawPic
 */
 void Sbar_DrawPic (int x, int y, sbarpic_t *sbarpic)
 {
-	Draw_Pic (sbar_x + x, sbar_y + y, Sbar_GetQPic(sbarpic));
+	DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, sbar_alpha.value, 0);
 }
 
-void Draw_AlphaPic (int x, int y, qpic_t *pic, float alpha);
 void Sbar_DrawAlphaPic (int x, int y, sbarpic_t *sbarpic, float alpha)
 {
-	Draw_AlphaPic (sbar_x + x, sbar_y + y, Sbar_GetQPic(sbarpic), alpha);
+	DrawQ_Pic (sbar_x + x, sbar_y + y, sbarpic->name, 0, 0, 1, 1, 1, alpha * sbar_alpha.value, 0);
 }
 
 /*
@@ -317,7 +353,7 @@ Draws one solid graphics character
 */
 void Sbar_DrawCharacter (int x, int y, int num)
 {
-	Draw_Character (sbar_x + x + 4 , sbar_y + y, num);
+	DrawQ_String (sbar_x + x + 4 , sbar_y + y, va("%c", num), 0, 8, 8, 1, 1, 1, sbar_alpha.value, 0);
 }
 
 /*
@@ -327,77 +363,57 @@ Sbar_DrawString
 */
 void Sbar_DrawString (int x, int y, char *str)
 {
-	Draw_String (sbar_x + x, sbar_y + y, str, 0);
+	DrawQ_String (sbar_x + x, sbar_y + y, str, 0, 8, 8, 1, 1, 1, sbar_alpha.value, 0);
 }
 
-int pow10table[10] =
-{
-	1,
-	10,
-	100,
-	1000,
-	10000,
-	100000,
-	1000000,
-	10000000,
-	100000000,
-	1000000000,
-};
-
 /*
 =============
-Sbar_itoa
+Sbar_DrawNum
 =============
 */
-int Sbar_itoa (int num, char *buf)
+void Sbar_DrawNum (int x, int y, int num, int digits, int color)
 {
-	int i;
-	char *str;
+	char str[32], *ptr;
+	int l, frame;
 
-	str = buf;
+	l = sprintf(str, "%i", num);
+	ptr = str;
+	if (l > digits)
+		ptr += (l-digits);
+	if (l < digits)
+		x += (digits-l)*24;
 
-	if (num < 0)
+	while (*ptr)
 	{
-		*str++ = '-';
-		num = -num;
-	}
+		if (*ptr == '-')
+			frame = STAT_MINUS;
+		else
+			frame = *ptr -'0';
 
-	for (i = 9;i > 0 && num < pow10table[i];i--);
+		Sbar_DrawPic (x, y, sb_nums[color][frame]);
+		x += 24;
 
-	for (;i >= 0;i--)
-	{
-		*str = '0';
-		while (num >= pow10table[i])
-		{
-			num -= pow10table[i];
-			(*str)++;
-		}
-		str++;
+		ptr++;
 	}
-
-	*str = 0;
-
-	return str - buf;
 }
 
-
 /*
 =============
-Sbar_DrawNum
+Sbar_DrawXNum
 =============
 */
-void Sbar_DrawNum (int x, int y, int num, int digits, int color)
+
+void Sbar_DrawXNum (int x, int y, int num, int digits, int lettersize, float r, float g, float b, float a, int flags)
 {
-	char			str[16];
-	char			*ptr;
-	int				l, frame;
+	char str[32], *ptr;
+	int l, frame;
 
-	l = Sbar_itoa (num, str);
+	l = sprintf(str, "%i", num);
 	ptr = str;
 	if (l > digits)
 		ptr += (l-digits);
 	if (l < digits)
-		x += (digits-l)*24;
+		x += (digits-l) * lettersize;
 
 	while (*ptr)
 	{
@@ -406,27 +422,23 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color)
 		else
 			frame = *ptr -'0';
 
-		Sbar_DrawPic (x, y, sb_nums[color][frame]);
-		x += 24;
+		DrawQ_Pic (sbar_x + x, sbar_y + y, sb_nums[0][frame]->name,lettersize,lettersize,r,g,b,a * sbar_alpha.value,flags);
+		x += lettersize;
+
 		ptr++;
 	}
 }
 
 //=============================================================================
 
-int		fragsort[MAX_SCOREBOARD];
-
-char	scoreboardtext[MAX_SCOREBOARD][20];
-int		scoreboardtop[MAX_SCOREBOARD];
-int		scoreboardbottom[MAX_SCOREBOARD];
-int		scoreboardcount[MAX_SCOREBOARD];
-int		scoreboardlines;
 
 /*
 ===============
 Sbar_SortFrags
 ===============
 */
+static int fragsort[MAX_SCOREBOARD];
+static int scoreboardlines;
 void Sbar_SortFrags (void)
 {
 	int		i, j, k;
@@ -452,37 +464,6 @@ void Sbar_SortFrags (void)
 			}
 }
 
-/*
-===============
-Sbar_UpdateScoreboard
-===============
-*/
-void Sbar_UpdateScoreboard (void)
-{
-	int		i, k;
-	int		top, bottom;
-	scoreboard_t	*s;
-
-	Sbar_SortFrags ();
-
-// draw the text
-	memset (scoreboardtext, 0, sizeof(scoreboardtext));
-
-	for (i=0 ; i<scoreboardlines; i++)
-	{
-		k = fragsort[i];
-		s = &cl.scores[k];
-		sprintf (&scoreboardtext[i][1], "%3i %s", s->frags, s->name);
-
-		top = s->colors & 0xf0;
-		bottom = (s->colors & 15) <<4;
-		scoreboardtop[i] = top + 8;
-		scoreboardbottom[i] = bottom + 8;
-	}
-}
-
-
-
 /*
 ===============
 Sbar_SoloScoreboard
@@ -527,6 +508,20 @@ void Sbar_DrawScoreboard (void)
 
 //=============================================================================
 
+// AK to make DrawInventory smaller
+static void Sbar_DrawWeapon(int nr, float fade, int active)
+{
+	// width = 300, height = 100
+	const int w_width = 300, w_height = 100, w_space = 10, font_size = 10;
+	const float w_scale = 0.4;
+
+	DrawQ_Pic(vid.conwidth - (w_width + w_space) * w_scale, (w_height + w_space) * w_scale * nr + w_space, sb_weapons[0][nr]->name, w_width * w_scale, w_height * w_scale, (active) ? 1 : 0.6, active ? 1 : 0.6, active ? 1 : 1, fade * sbar_alpha.value, DRAWFLAG_ADDITIVE);
+	DrawQ_String(vid.conwidth - (w_space + font_size ), (w_height + w_space) * w_scale * nr + w_space, va("%i",nr+1), 0, font_size, font_size, 1, 0, 0, fade, 0);
+
+	if (active)
+		DrawQ_Fill(vid.conwidth - (w_width + w_space) * w_scale, (w_height + w_space) * w_scale * nr + w_space, w_width * w_scale, w_height * w_scale, 0.3, 0.3, 0.3, fade * sbar_alpha.value, DRAWFLAG_ADDITIVE);
+}
+
 /*
 ===============
 Sbar_DrawInventory
@@ -534,10 +529,10 @@ Sbar_DrawInventory
 */
 void Sbar_DrawInventory (void)
 {
-	int		i;
-	char	num[6];
-	float	time;
-	int		flashon;
+	int i;
+	char num[6];
+	float time;
+	int flashon;
 
 	if (gamemode == GAME_ROGUE)
 	{
@@ -683,15 +678,14 @@ Sbar_DrawFrags
 */
 void Sbar_DrawFrags (void)
 {
-	int				i, k, l;
-	int				top, bottom;
-	int				x, f;
-	char			num[12];
-	scoreboard_t	*s;
+	int i, k, l, x, f;
+	char num[12];
+	scoreboard_t *s;
+	qbyte *c;
 
 	Sbar_SortFrags ();
 
-// draw the text
+	// draw the text
 	l = scoreboardlines <= 4 ? scoreboardlines : 4;
 
 	x = 23 * 8;
@@ -703,14 +697,13 @@ void Sbar_DrawFrags (void)
 		if (!s->name[0])
 			continue;
 
-	// draw background
-		top = (s->colors & 0xf0) + 8;
-		bottom = ((s->colors & 15)<<4) + 8;
-
-		Draw_Fill (sbar_x + x + 10, sbar_y     - 23, 28, 4, top);
-		Draw_Fill (sbar_x + x + 10, sbar_y + 4 - 23, 28, 3, bottom);
+		// draw background
+		c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8];
+		DrawQ_Fill (sbar_x + x + 10, sbar_y     - 23, 28, 4, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha.value, 0);
+		c = (qbyte *)&palette_complete[((s->colors & 15)<<4) + 8];
+		DrawQ_Fill (sbar_x + x + 10, sbar_y + 4 - 23, 28, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha.value, 0);
 
-	// draw number
+		// draw number
 		f = s->frags;
 		sprintf (num, "%3i",f);
 
@@ -741,26 +734,25 @@ void Sbar_DrawFace (void)
 
 // PGM 01/19/97 - team color drawing
 // PGM 03/02/97 - fixed so color swatch only appears in CTF modes
-	if (gamemode == GAME_ROGUE && (cl.maxclients != 1) && (teamplay.integer > 3) && (teamplay.integer < 7))
+	if (gamemode == GAME_ROGUE && !cl.islocalgame && (teamplay.integer > 3) && (teamplay.integer < 7))
 	{
-		int				top, bottom;
-		char			num[12];
-		scoreboard_t	*s;
+		char num[12];
+		scoreboard_t *s;
+		qbyte *c;
 
 		s = &cl.scores[cl.viewentity - 1];
 		// draw background
-		top = (s->colors & 0xf0) + 8;
-		bottom = ((s->colors & 15)<<4) + 8;
-
 		Sbar_DrawPic (112, 0, rsb_teambord);
-		Draw_Fill (sbar_x + 113, vid.conheight-SBAR_HEIGHT+3, 22, 9, top);
-		Draw_Fill (sbar_x + 113, vid.conheight-SBAR_HEIGHT+12, 22, 9, bottom);
+		c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8];
+		DrawQ_Fill (sbar_x + 113, vid.conheight-SBAR_HEIGHT+3, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha.value, 0);
+		c = (qbyte *)&palette_complete[((s->colors & 15)<<4) + 8];
+		DrawQ_Fill (sbar_x + 113, vid.conheight-SBAR_HEIGHT+12, 22, 9, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha.value, 0);
 
 		// draw number
 		f = s->frags;
 		sprintf (num, "%3i",f);
 
-		if (top==8)
+		if ((s->colors & 0xf0)==0)
 		{
 			if (num[0] != ' ')
 				Sbar_DrawCharacter(109, 3, 18 + num[0] - '0');
@@ -796,6 +788,97 @@ void Sbar_DrawFace (void)
 	}
 }
 
+void Sbar_ShowFPS(void)
+{
+	float fps_x, fps_y, fps_scalex, fps_scaley, fps_height;
+	char fpsstring[32];
+	char timestring[32];
+	char datestring[32];
+	fpsstring[0] = 0;
+	timestring[0] = 0;
+	datestring[0] = 0;
+	if (showfps.integer)
+	{
+		int calc;
+		if (showfps.integer > 1)
+		{
+			static double currtime, frametimes[32];
+			double newtime, total;
+			int count, i;
+			static int framecycle = 0;
+
+			newtime = Sys_DoubleTime();
+			frametimes[framecycle] = newtime - currtime;
+			total = 0;
+			count = 0;
+			while(total < 0.2 && count < 32 && frametimes[i = (framecycle - count) & 31])
+			{
+				total += frametimes[i];
+				count++;
+			}
+			framecycle++;
+			framecycle &= 31;
+			if (showfps.integer == 2)
+				calc = (int) (((double) count / total) + 0.5);
+			else // showfps 3, rapid update
+				calc = (int) ((1.0 / (newtime - currtime)) + 0.5);
+			currtime = newtime;
+		}
+		else
+		{
+			static double nexttime = 0, lasttime = 0;
+			static int framerate = 0, framecount = 0;
+			double newtime;
+			newtime = Sys_DoubleTime();
+			if (newtime < nexttime)
+				framecount++;
+			else
+			{
+				framerate = (int) (framecount / (newtime - lasttime) + 0.5);
+				lasttime = newtime;
+				nexttime = lasttime + 0.2;
+				framecount = 1;
+			}
+			calc = framerate;
+		}
+		snprintf(fpsstring, sizeof(fpsstring), "%4i fps", calc);
+	}
+	if (showtime.integer)
+		strlcpy(timestring, Sys_TimeString(showtime_format.string), sizeof(timestring));
+	if (showdate.integer)
+		strlcpy(datestring, Sys_TimeString(showdate_format.string), sizeof(datestring));
+	if (fpsstring[0] || timestring[0])
+	{
+		fps_scalex = 12;
+		fps_scaley = 12;
+		fps_height = fps_scaley * ((fpsstring[0] != 0) + (timestring[0] != 0) + (datestring[0] != 0));
+		//fps_y = vid.conheight - sb_lines; // yes this may draw over the sbar
+		//fps_y = bound(0, fps_y, vid.conheight - fps_height);
+		fps_y = vid.conheight - fps_height;
+		if (fpsstring[0])
+		{
+			fps_x = vid.conwidth - fps_scalex * strlen(fpsstring);
+			DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(fpsstring), fps_scaley, 0, 0, 0, 0.5 * sbar_alpha.value, 0);
+			DrawQ_String(fps_x, fps_y, fpsstring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1 * sbar_alpha.value, 0);
+			fps_y += fps_scaley;
+		}
+		if (timestring[0])
+		{
+			fps_x = vid.conwidth - fps_scalex * strlen(timestring);
+			DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(timestring), fps_scaley, 0, 0, 0, 0.5 * sbar_alpha.value, 0);
+			DrawQ_String(fps_x, fps_y, timestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1 * sbar_alpha.value, 0);
+			fps_y += fps_scaley;
+		}
+		if (datestring[0])
+		{
+			fps_x = vid.conwidth - fps_scalex * strlen(datestring);
+			DrawQ_Fill(fps_x, fps_y, fps_scalex * strlen(datestring), fps_scaley, 0, 0, 0, 0.5 * sbar_alpha.value, 0);
+			DrawQ_String(fps_x, fps_y, datestring, 0, fps_scalex, fps_scaley, 1, 1, 1, 1 * sbar_alpha.value, 0);
+			fps_y += fps_scaley;
+		}
+	}
+}
+
 /*
 ===============
 Sbar_Draw
@@ -806,108 +889,256 @@ void Sbar_Draw (void)
 	if (scr_con_current == vid.conheight)
 		return;		// console is full screen
 
-	sbar_y = vid.conheight - SBAR_HEIGHT;
-	if (cl.gametype == GAME_DEATHMATCH)
-		sbar_x = 0;
-	else
-		sbar_x = (vid.conwidth - 320)/2;
-
-	if (sb_lines > 24)
+	if (cl.intermission == 1)
 	{
-		Sbar_DrawInventory ();
-		if (cl.maxclients != 1)
-			Sbar_DrawFrags ();
+		Sbar_IntermissionOverlay();
+		return;
 	}
-
-	if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
+	else if (cl.intermission == 2)
 	{
-		Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
-		Sbar_DrawScoreboard ();
+		Sbar_FinaleOverlay();
+		return;
 	}
-	else if (sb_lines)
-	{
-		Sbar_DrawAlphaPic (0, 0, sb_sbar, 0.4);
 
-// keys (hipnotic only)
-		//MED 01/04/97 moved keys here so they would not be overwritten
-		if (gamemode == GAME_HIPNOTIC)
+	if (gamemode == GAME_SOM)
+	{
+		if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
+			Sbar_DrawScoreboard ();
+		else if (sb_lines)
 		{
-			if (cl.items & IT_KEY1)
-				Sbar_DrawPic (209, 3, sb_items[0]);
-			if (cl.items & IT_KEY2)
-				Sbar_DrawPic (209, 12, sb_items[1]);
+			// this is the top left of the sbar area
+			sbar_x = 0;
+			sbar_y = vid.conheight - 24*3;
+
+			// armor
+			if (cl.stats[STAT_ARMOR])
+			{
+				if (cl.items & IT_ARMOR3)
+					Sbar_DrawPic(0, 0, somsb_armor[2]);
+				else if (cl.items & IT_ARMOR2)
+					Sbar_DrawPic(0, 0, somsb_armor[1]);
+				else if (cl.items & IT_ARMOR1)
+					Sbar_DrawPic(0, 0, somsb_armor[0]);
+				Sbar_DrawNum(24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
+			}
+
+			// health
+			Sbar_DrawPic(0, 24, somsb_health);
+			Sbar_DrawNum(24, 24, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
+
+			// ammo icon
+			if (cl.items & IT_SHELLS)
+				Sbar_DrawPic(0, 48, somsb_ammo[0]);
+			else if (cl.items & IT_NAILS)
+				Sbar_DrawPic(0, 48, somsb_ammo[1]);
+			else if (cl.items & IT_ROCKETS)
+				Sbar_DrawPic(0, 48, somsb_ammo[2]);
+			else if (cl.items & IT_CELLS)
+				Sbar_DrawPic(0, 48, somsb_ammo[3]);
+			Sbar_DrawNum(24, 48, cl.stats[STAT_AMMO], 3, false);
+			if (cl.stats[STAT_SHELLS])
+				Sbar_DrawNum(24 + 3*24, 48, cl.stats[STAT_SHELLS], 1, true);
 		}
-// armor
-		if (cl.items & IT_INVULNERABILITY)
+	}
+	else if (gamemode == GAME_NEXUIZ)
+	{
+		sbar_y = vid.conheight - 47;
+		sbar_x = (vid.conwidth - 640)/2;
+
+		if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
 		{
-			Sbar_DrawNum (24, 0, 666, 3, 1);
-			Sbar_DrawPic (0, 0, sb_disc);
+			Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
+			Sbar_DrawScoreboard ();
 		}
-		else
+		else if (sb_lines)
 		{
-			if (gamemode == GAME_ROGUE)
+			int i;
+			double time;
+			float fade;
+
+			// we have a max time 2s (min time = 0)
+			if ((time = cl.time - cl.weapontime) < 2)
 			{
-				Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
-				if (cl.items & RIT_ARMOR3)
-					Sbar_DrawPic (0, 0, sb_armor[2]);
-				else if (cl.items & RIT_ARMOR2)
-					Sbar_DrawPic (0, 0, sb_armor[1]);
-				else if (cl.items & RIT_ARMOR1)
-					Sbar_DrawPic (0, 0, sb_armor[0]);
+				fade = (1.0 - 0.5 * time);
+				fade *= fade;
+				for (i = 0; i < 8;i++)
+				{
+					if (!(cl.items & (1 << i)))
+						continue;
+					Sbar_DrawWeapon(i + 1, fade, (i == cl.stats[STAT_ACTIVEWEAPON]));
+				}
+			
+				if((cl.items & (1<<12)))
+					Sbar_DrawWeapon(0, fade, (cl.stats[STAT_ACTIVEWEAPON] == 12));
 			}
+
+			//if (!cl.islocalgame)
+			//	Sbar_DrawFrags ();
+
+			if (sb_lines > 24)
+				Sbar_DrawAlphaPic (0, 0, sb_sbar, sbar_alpha.value);
 			else
+				Sbar_DrawAlphaPic (0, 0, sb_sbar_minimal, sbar_alpha.value);
+
+			// special items
+			if (cl.items & IT_INVULNERABILITY)
 			{
-				Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
-				if (cl.items & IT_ARMOR3)
-					Sbar_DrawPic (0, 0, sb_armor[2]);
-				else if (cl.items & IT_ARMOR2)
-					Sbar_DrawPic (0, 0, sb_armor[1]);
-				else if (cl.items & IT_ARMOR1)
-					Sbar_DrawPic (0, 0, sb_armor[0]);
+				Sbar_DrawNum (36, 0, 666, 3, 1);
+				Sbar_DrawPic (0, 0, sb_disc);
+			}
+
+			// armor
+			Sbar_DrawXNum ((340-3*24), 12, cl.stats[STAT_ARMOR], 3, 24, 0.6,0.7,0.8,1,0);
+
+			// health
+			if(cl.stats[STAT_HEALTH] > 100)
+				Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,1,1,1,1,0);
+			else if(cl.stats[STAT_HEALTH] <= 25 && cl.time - (int)cl.time > 0.5)
+				Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,0.7,0,0,1,0);
+			else
+				Sbar_DrawXNum((154-3*24),12,cl.stats[STAT_HEALTH],3,24,0.6,0.7,0.8,1,0);
+
+			// AK dont draw ammo for the laser
+			if(cl.stats[STAT_ACTIVEWEAPON] != 12)
+			{
+				if (cl.items & NEX_IT_SHELLS)
+					Sbar_DrawPic (519, 0, sb_ammo[0]);
+				else if (cl.items & NEX_IT_BULLETS)
+					Sbar_DrawPic (519, 0, sb_ammo[1]);
+				else if (cl.items & NEX_IT_ROCKETS)
+					Sbar_DrawPic (519, 0, sb_ammo[2]);
+				else if (cl.items & NEX_IT_CELLS)
+					Sbar_DrawPic (519, 0, sb_ammo[3]);
+
+				if(cl.stats[STAT_AMMO] <= 10)
+					Sbar_DrawXNum ((519-3*24), 12, cl.stats[STAT_AMMO], 3, 24, 0.7, 0,0,1,0);
+				else
+					Sbar_DrawXNum ((519-3*24), 12, cl.stats[STAT_AMMO], 3, 24, 0.6, 0.7,0.8,1,0);
+
 			}
+
+			if (sb_lines > 24)
+				DrawQ_Pic(sbar_x,sbar_y,sb_sbar_overlay->name,0,0,1,1,1,1,DRAWFLAG_MODULATE);
 		}
 
-	// face
-		Sbar_DrawFace ();
+		//if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
+		//	Sbar_MiniDeathmatchOverlay (0, 17);
+	}
+	else // Quake and others
+	{
+		sbar_y = vid.conheight - SBAR_HEIGHT;
+		if (cl.gametype == GAME_DEATHMATCH)
+			sbar_x = 0;
+		else
+			sbar_x = (vid.conwidth - 320)/2;
 
-	// health
-		Sbar_DrawNum (136, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
+		if (sb_lines > 24)
+		{
+			if (gamemode != GAME_GOODVSBAD2)
+				Sbar_DrawInventory ();
+			if (!cl.islocalgame)
+				Sbar_DrawFrags ();
+		}
 
-	// ammo icon
-		if (gamemode == GAME_ROGUE)
+		if (sb_showscores || cl.stats[STAT_HEALTH] <= 0)
 		{
-			if (cl.items & RIT_SHELLS)
-				Sbar_DrawPic (224, 0, sb_ammo[0]);
-			else if (cl.items & RIT_NAILS)
-				Sbar_DrawPic (224, 0, sb_ammo[1]);
-			else if (cl.items & RIT_ROCKETS)
-				Sbar_DrawPic (224, 0, sb_ammo[2]);
-			else if (cl.items & RIT_CELLS)
-				Sbar_DrawPic (224, 0, sb_ammo[3]);
-			else if (cl.items & RIT_LAVA_NAILS)
-				Sbar_DrawPic (224, 0, rsb_ammo[0]);
-			else if (cl.items & RIT_PLASMA_AMMO)
-				Sbar_DrawPic (224, 0, rsb_ammo[1]);
-			else if (cl.items & RIT_MULTI_ROCKETS)
-				Sbar_DrawPic (224, 0, rsb_ammo[2]);
+			if (gamemode != GAME_GOODVSBAD2)
+				Sbar_DrawAlphaPic (0, 0, sb_scorebar, 0.4);
+			Sbar_DrawScoreboard ();
 		}
-		else
+		else if (sb_lines)
 		{
-			if (cl.items & IT_SHELLS)
-				Sbar_DrawPic (224, 0, sb_ammo[0]);
-			else if (cl.items & IT_NAILS)
-				Sbar_DrawPic (224, 0, sb_ammo[1]);
-			else if (cl.items & IT_ROCKETS)
-				Sbar_DrawPic (224, 0, sb_ammo[2]);
-			else if (cl.items & IT_CELLS)
-				Sbar_DrawPic (224, 0, sb_ammo[3]);
+			Sbar_DrawAlphaPic (0, 0, sb_sbar, 0.4);
+
+			// keys (hipnotic only)
+			//MED 01/04/97 moved keys here so they would not be overwritten
+			if (gamemode == GAME_HIPNOTIC)
+			{
+				if (cl.items & IT_KEY1)
+					Sbar_DrawPic (209, 3, sb_items[0]);
+				if (cl.items & IT_KEY2)
+					Sbar_DrawPic (209, 12, sb_items[1]);
+			}
+			// armor
+			if (gamemode != GAME_GOODVSBAD2)
+			{
+				if (cl.items & IT_INVULNERABILITY)
+				{
+					Sbar_DrawNum (24, 0, 666, 3, 1);
+					Sbar_DrawPic (0, 0, sb_disc);
+				}
+				else
+				{
+					if (gamemode == GAME_ROGUE)
+					{
+						Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
+						if (cl.items & RIT_ARMOR3)
+							Sbar_DrawPic (0, 0, sb_armor[2]);
+						else if (cl.items & RIT_ARMOR2)
+							Sbar_DrawPic (0, 0, sb_armor[1]);
+						else if (cl.items & RIT_ARMOR1)
+							Sbar_DrawPic (0, 0, sb_armor[0]);
+					}
+					else
+					{
+						Sbar_DrawNum (24, 0, cl.stats[STAT_ARMOR], 3, cl.stats[STAT_ARMOR] <= 25);
+						if (cl.items & IT_ARMOR3)
+							Sbar_DrawPic (0, 0, sb_armor[2]);
+						else if (cl.items & IT_ARMOR2)
+							Sbar_DrawPic (0, 0, sb_armor[1]);
+						else if (cl.items & IT_ARMOR1)
+							Sbar_DrawPic (0, 0, sb_armor[0]);
+					}
+				}
+			}
+
+			// face
+			Sbar_DrawFace ();
+
+			// health
+			Sbar_DrawNum (154, 0, cl.stats[STAT_HEALTH], 3, cl.stats[STAT_HEALTH] <= 25);
+
+			// ammo icon
+			if (gamemode == GAME_ROGUE)
+			{
+				if (cl.items & RIT_SHELLS)
+					Sbar_DrawPic (224, 0, sb_ammo[0]);
+				else if (cl.items & RIT_NAILS)
+					Sbar_DrawPic (224, 0, sb_ammo[1]);
+				else if (cl.items & RIT_ROCKETS)
+					Sbar_DrawPic (224, 0, sb_ammo[2]);
+				else if (cl.items & RIT_CELLS)
+					Sbar_DrawPic (224, 0, sb_ammo[3]);
+				else if (cl.items & RIT_LAVA_NAILS)
+					Sbar_DrawPic (224, 0, rsb_ammo[0]);
+				else if (cl.items & RIT_PLASMA_AMMO)
+					Sbar_DrawPic (224, 0, rsb_ammo[1]);
+				else if (cl.items & RIT_MULTI_ROCKETS)
+					Sbar_DrawPic (224, 0, rsb_ammo[2]);
+			}
+			else
+			{
+				if (cl.items & IT_SHELLS)
+					Sbar_DrawPic (224, 0, sb_ammo[0]);
+				else if (cl.items & IT_NAILS)
+					Sbar_DrawPic (224, 0, sb_ammo[1]);
+				else if (cl.items & IT_ROCKETS)
+					Sbar_DrawPic (224, 0, sb_ammo[2]);
+				else if (cl.items & IT_CELLS)
+					Sbar_DrawPic (224, 0, sb_ammo[3]);
+			}
+
+			Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
+
 		}
 
-		Sbar_DrawNum (248, 0, cl.stats[STAT_AMMO], 3, cl.stats[STAT_AMMO] <= 10);
+		if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
+			Sbar_MiniDeathmatchOverlay (324, vid.conheight - sb_lines);
 	}
 
-	if (vid.conwidth > 320 && cl.gametype == GAME_DEATHMATCH)
-		Sbar_MiniDeathmatchOverlay ();
+	Sbar_ShowFPS();
+
+	R_Draw2DCrosshair();
 }
 
 //=============================================================================
@@ -918,54 +1149,39 @@ Sbar_DeathmatchOverlay
 
 ==================
 */
+float Sbar_PrintScoreboardItem(scoreboard_t *s, float x, float y)
+{
+	qbyte *c;
+	if (s->name[0] || s->frags || s->colors || (s - cl.scores) == cl.playerentity - 1)
+	{
+		// draw colors behind score
+		c = (qbyte *)&palette_complete[(s->colors & 0xf0) + 8];
+		DrawQ_Fill(x + 8, y+1, 32, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha.value, 0);
+		c = (qbyte *)&palette_complete[((s->colors & 15)<<4) + 8];
+		DrawQ_Fill(x + 8, y+4, 32, 3, c[0] * (1.0f / 255.0f), c[1] * (1.0f / 255.0f), c[2] * (1.0f / 255.0f), c[3] * (1.0f / 255.0f) * sbar_alpha.value, 0);
+		// print the text
+		DrawQ_String(x, y, va("%c%4i %s", (s - cl.scores) == cl.playerentity - 1 ? 13 : ' ', (int) s->frags, s->name), 0, 8, 8, 1, 1, 1, 1 * sbar_alpha.value, 0);
+		return 8;
+	}
+	else
+		return 0;
+}
+
 void Sbar_DeathmatchOverlay (void)
 {
-	qpic_t			*pic;
-	int				i, k, l, top, bottom, x, y, total, n, minutes, tens, units, fph;
-	char			num[128];
-	scoreboard_t	*s;
+	int i, x, y;
+	cachepic_t *pic;
 
 	pic = Draw_CachePic ("gfx/ranking.lmp");
-	Draw_Pic ((vid.conwidth - pic->width)/2, 8, pic);
+	DrawQ_Pic ((vid.conwidth - pic->width)/2, 8, "gfx/ranking.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha.value, 0);
 
-// scores
+	// scores
 	Sbar_SortFrags ();
-
-// draw the text
-	l = scoreboardlines;
-
-	x = ((vid.conwidth - 320)>>1) - 140;
+	// draw the text
+	x = (vid.conwidth - (6 + 15) * 8) / 2;
 	y = 40;
-	for (i = 0;i < l;i++)
-	{
-		k = fragsort[i];
-		s = &cl.scores[k];
-		if (!s->name[0])
-			continue;
-
-	// draw background
-		top = (s->colors & 0xf0) + 8;
-		bottom = ((s->colors & 15)<<4) + 8;
-
-		Draw_Fill ( x, y+1, 88, 3, top);
-		Draw_Fill ( x, y+4, 88, 3, bottom);
-
-		total = cl.time - s->entertime;
-		minutes = (int)total/60;
-		n = total - minutes*60;
-		tens = '0' + n/10;
-		units = '0' + n%10;
-
-		fph = total ? (int) ((float) s->frags * 3600.0 / total) : 0;
-		if (fph < -999) fph = -999;
-		if (fph > 9999) fph = 9999;
-
-		// put it together
-		sprintf (num, "%c %4i:%4i %4i:%c%c %s", k == cl.viewentity - 1 ? 12 : ' ', (int) s->frags, fph, minutes, tens, units, s->name);
-		Draw_String(x - 8, y, num, 0);
-
-		y += 8;
-	}
+	for (i = 0;i < scoreboardlines && y < vid.conheight;i++)
+		y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
 }
 
 /*
@@ -974,65 +1190,35 @@ Sbar_DeathmatchOverlay
 
 ==================
 */
-void Sbar_MiniDeathmatchOverlay (void)
+void Sbar_MiniDeathmatchOverlay (int x, int y)
 {
-	int				i, l, k, top, bottom, x, y, fph, numlines;
-	char			num[128];
-	scoreboard_t	*s;
+	int i, numlines;
 
-	if (vid.conwidth < 512 || !sb_lines)
+	// decide where to print
+
+	numlines = (vid.conheight - y) / 8;
+	// give up if there isn't room
+	if (x + (6 + 15) * 8 > vid.conwidth || numlines < 1)
 		return;
 
-// scores
+	// scores
 	Sbar_SortFrags ();
 
-// draw the text
-	l = scoreboardlines;
-	y = vid.conheight - sb_lines;
-	numlines = sb_lines/8;
-	if (numlines < 3)
-		return;
-
 	//find us
 	for (i = 0; i < scoreboardlines; i++)
-		if (fragsort[i] == cl.viewentity - 1)
+		if (fragsort[i] == cl.playerentity - 1)
 			break;
 
-    if (i == scoreboardlines) // we're not there
-            i = 0;
-    else // figure out start
-            i = i - numlines/2;
-
-    if (i > scoreboardlines - numlines)
-            i = scoreboardlines - numlines;
-    if (i < 0)
-            i = 0;
-
-	x = 324;
-	for (;i < scoreboardlines && y < vid.conheight - 8;i++)
+	if (i == scoreboardlines) // we're not there
+		i = 0;
+	else // figure out start
 	{
-		k = fragsort[i];
-		s = &cl.scores[k];
-		if (!s->name[0])
-			continue;
-
-	// draw background
-		top = (s->colors & 0xf0) + 8;
-		bottom = ((s->colors & 15)<<4) + 8;
-
-		Draw_Fill ( x, y+1, 72, 3, top);
-		Draw_Fill ( x, y+4, 72, 3, bottom);
-
-		fph = (cl.time - s->entertime) ? (int) ((float) s->frags * 3600.0 / (cl.time - s->entertime)) : 0;
-		if (fph < -999) fph = -999;
-		if (fph > 9999) fph = 9999;
-
-		// put it together
-		sprintf (num, "%c%4i:%4i%c %s", k == cl.viewentity - 1 ? 16 : ' ', (int) s->frags, fph, k == cl.viewentity - 1 ? 17 : ' ', s->name);
-		Draw_String(x - 8, y, num, 0);
-
-		y += 8;
+		i -= numlines/2;
+		i = bound(0, i, scoreboardlines - numlines);
 	}
+
+	for (;i < scoreboardlines && y < vid.conheight;i++)
+		y += Sbar_PrintScoreboardItem(cl.scores + fragsort[i], x, y);
 }
 
 /*
@@ -1052,11 +1238,11 @@ void Sbar_IntermissionOverlay (void)
 		return;
 	}
 
-	sbar_x = 0;
-	sbar_y = 0;
+	sbar_x = (vid.conwidth - 320) >> 1;
+	sbar_y = (vid.conheight - 200) >> 1;
 
-	Draw_Pic (64, 24, Draw_CachePic ("gfx/complete.lmp"));
-	Draw_Pic (0, 56, Draw_CachePic ("gfx/inter.lmp"));
+	DrawQ_Pic (sbar_x + 64, sbar_y + 24, "gfx/complete.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha.value, 0);
+	DrawQ_Pic (sbar_x + 0, sbar_y + 56, "gfx/inter.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha.value, 0);
 
 // time
 	dig = cl.completed_time/60;
@@ -1085,8 +1271,9 @@ Sbar_FinaleOverlay
 */
 void Sbar_FinaleOverlay (void)
 {
-	qpic_t	*pic;
+	cachepic_t	*pic;
 
 	pic = Draw_CachePic ("gfx/finale.lmp");
-	Draw_Pic((vid.conwidth - pic->width)/2, 16, pic);
+	DrawQ_Pic((vid.conwidth - pic->width)/2, 16, "gfx/finale.lmp", 0, 0, 1, 1, 1, 1 * sbar_alpha.value, 0);
 }
+