From ed0f1379b148e84e2770dfd575e78739b54ff278 Mon Sep 17 00:00:00 2001
From: Tyler Young <tyleryoung88@yahoo.com>
Date: Sun, 22 Jan 2023 19:31:48 -0500
Subject: [PATCH] Restored missing entity fields

iframetime
bleed_out
Weapon_Name
---
 source/gl_hud.c    |  1 +
 source/menu.c      | 12 ++++++------
 source/progdefs.q1 |  3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/source/gl_hud.c b/source/gl_hud.c
index 3ef413e..5aba91d 100644
--- a/source/gl_hud.c
+++ b/source/gl_hud.c
@@ -1580,6 +1580,7 @@ void HUD_Weapon (void)
 #else
 	y_value = vid.height - 16 - fragpic->height - 4 - 16;
 #endif
+	//strcpy(str, pr_strings+sv_player->v.Weapon_Name);
 	strcpy(str, GetWeaponName(cl.stats[STAT_ACTIVEWEAPON]));
 	l = strlen(str);
 #ifdef VITA
diff --git a/source/menu.c b/source/menu.c
index fa815cf..c8a989e 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, 150);
+	Draw_FillByColor(0, 0, 1280, 720, 0, 0, 0, 1);
 
 	// 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, 220, 220, 220, 220);
+	Draw_FillByColor(10, y + 90, 240, 3, 220, 220, 220, 0.8);
 
 	// 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, 220, 220, 220, 220);
+	Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 0.8);
 
 	// 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, 220, 220, 220, 220);
+	Draw_FillByColor(10, y + 165, 240, 3, 220, 220, 220, 0.8);
 
 	// 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, 220, 220, 220, 220);
+	Draw_FillByColor(10, y + 135, 240, 3, 220, 220, 220, 0.8);
 
 	// 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, 220, 220, 220, 220);
+	Draw_FillByColor(10, y + 105, 240, 3, 220, 220, 220, 0.8);
 
 	// Console
 	if (options_cursor == 3)
diff --git a/source/progdefs.q1 b/source/progdefs.q1
index 66a1e48..84ada33 100644
--- a/source/progdefs.q1
+++ b/source/progdefs.q1
@@ -76,6 +76,7 @@ typedef struct
 	string_t	model;
 	float		frame;
 	float		skin;
+	float       iframetime;
 	float		effects;
 	vec3_t		mins;
 	vec3_t		maxs;
@@ -143,6 +144,7 @@ typedef struct
 	string_t	targetname;
 	float		dmg_take;
 	float		dmg_save;
+	float       bleed_out;
 	float		progress_bar;
 	int			dmg_inflictor;
 	int			owner;
@@ -155,6 +157,7 @@ typedef struct
 	string_t	noise3;
 	float		x2_icon;
 	float		insta_icon;
+	string_t	Weapon_Name;
 	string_t 	Weapon_Name_Touch;
 	vec3_t 		ADS_Offset;
 	vec3_t  	Flash_Offset;