From 7e5688bb454da85315db84428a04d6f6a659b0bd Mon Sep 17 00:00:00 2001
From: Tyler Young <tyleryoung88@yahoo.com>
Date: Sun, 22 Jan 2023 16:27:43 -0500
Subject: [PATCH] Fixed menu dividers and adjusted betty positioning in HUD

---
 source/gl_hud.c |  8 ++++----
 source/menu.c   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/gl_hud.c b/source/gl_hud.c
index e3cf31e..3ef413e 100644
--- a/source/gl_hud.c
+++ b/source/gl_hud.c
@@ -1440,11 +1440,11 @@ void HUD_Grenades (void)
 	if (cl.stats[STAT_GRENADES] & UI_BETTY)
 	{
 	#ifdef VITA
-		Draw_StretchPic (x_value - fragpic->width - 5, y_value, bettypic, 64, 64);
+		Draw_StretchPic (x_value + fragpic->width + 15, y_value, bettypic, 64, 64);
 		if (cl.stats[STAT_PRIGRENADES] <= 0) {
-			Draw_ColoredStringScale (x_value + 36, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 0, 0, 1, 2.0f);
+			Draw_ColoredStringScale (x_value + 46, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 0, 0, 1, 2.0f);
 		} else {
-			Draw_ColoredStringScale (x_value - fragpic->width + 32, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 1, 1, 1, 2.0f);
+			Draw_ColoredStringScale (x_value + fragpic->width + 46, y_value + 44, va ("%i",cl.stats[STAT_SECGRENADES]), 1, 1, 1, 1, 2.0f);
 		}
 	#else
 		Draw_Pic (x_value - fragpic->width - 5, y_value, bettypic);
@@ -1583,7 +1583,7 @@ void HUD_Weapon (void)
 	strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON]));
 	l = strlen(str);
 #ifdef VITA
-	x_value = vid.width - fragpic->width - 60 - l*16;
+	x_value = vid.width - fragpic->width - 65 - l*16;
 	Draw_ColoredStringScale (x_value, y_value, str, 1, 1, 1, 1, 2.0f);
 #else
 	x_value = vid.width/2 - 8 - l*8;
diff --git a/source/menu.c b/source/menu.c
index 29549de..fa815cf 100644
--- a/source/menu.c
+++ b/source/menu.c
@@ -524,7 +524,7 @@ void M_Main_Draw (void)
 	Draw_BgMenu();
 
 	// Fill black to make everything easier to see
-	Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 0.4);
+	Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 150);
 
 	// Version String
 	Draw_ColoredString(vid.width - 40, y + 5, NZP_VERSION, 1, 1, 1, 1);
@@ -543,7 +543,7 @@ void M_Main_Draw (void)
 	Draw_ColoredStringScale(10, y + 70, "Co-Op (Coming Soon!)", 0.5, 0.5, 0.5, 1, 1.5f);
 
 	// Divider
-	Draw_FillByColor(10, y + 90, 240, 3, 1, 1, 1, 1);
+	Draw_FillByColor(10, y + 90, 240, 3, 220, 220, 220, 220);
 
 	// Settings
 	if (m_main_cursor == 1)
@@ -555,7 +555,7 @@ void M_Main_Draw (void)
 	Draw_ColoredStringScale(10, y + 115, "Achievements", 0.5, 0.5, 0.5, 1, 1.5f);
 
 	// Divider
-	Draw_FillByColor(10, y + 135, 240, 3, 1, 1, 1, 1);
+	Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 220);
 
 	// Credits
 	if (m_main_cursor == 2)
@@ -564,7 +564,7 @@ void M_Main_Draw (void)
 		Draw_ColoredStringScale(10, y + 145, "Credits", 1, 1, 1, 1, 1.5f);
 
 	// Divider
-	Draw_FillByColor(10, y + 165, 240, 3, 1, 1, 1, 1);
+	Draw_FillByColor(10, y + 165, 240, 3, 220, 220, 220, 220);
 
 	// Exit
 	if (m_main_cursor == 3)
@@ -851,7 +851,7 @@ void M_SinglePlayer_Draw (void)
 		Draw_ColoredStringScale(10, y + 115, "Christmas Special", 1, 1, 1, 1, 1.5f);
 
 	// Divider
-	Draw_FillByColor(10, y + 135, 240, 3, 1, 1, 1, 1);
+	Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 220);
 
 	// Custom Maps
 	if (m_singleplayer_cursor == 3)
@@ -1980,7 +1980,7 @@ void M_Options_Draw (void)
 		Draw_ColoredStringScale(10, y + 85, "Control Settings", 1, 1, 1, 1, 1.5f);
 
 	// Divider
-	Draw_FillByColor(10, y + 105, 240, 3, 1, 1, 1, 1);
+	Draw_FillByColor(10, y + 105, 240, 3, 220, 220, 220, 220);
 
 	// Console
 	if (options_cursor == 3)