From 003817f415f414314ff0dc507658a07558a143ea Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sun, 8 Feb 2015 11:08:02 +0200
Subject: [PATCH 1/2] Added customization of ammo display in alternative HUD

Added hud_showammo CVAR with three states:
* If value is 0, show ammo for current weapon only
* If value is 1, show ammo for available weapons
* If value is greater than 1, show ammo for all weapons
Default value is 2, so initial ammo display behavior isn't changed
---
 src/g_shared/shared_hud.cpp | 41 +++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/g_shared/shared_hud.cpp b/src/g_shared/shared_hud.cpp
index 110675791..89acd5fd2 100644
--- a/src/g_shared/shared_hud.cpp
+++ b/src/g_shared/shared_hud.cpp
@@ -73,6 +73,7 @@ CVAR (Bool,  hud_showitems,		false,CVAR_ARCHIVE);	// Show item stats on HUD
 CVAR (Bool,  hud_showstats,		false,	CVAR_ARCHIVE);	// for stamina and accuracy. 
 CVAR (Bool,  hud_showscore,		false,	CVAR_ARCHIVE);	// for user maintained score
 CVAR (Bool,  hud_showweapons,	true, CVAR_ARCHIVE);	// Show weapons collected
+CVAR (Int ,  hud_showammo,		2, CVAR_ARCHIVE);		// Show ammo collected
 CVAR (Int ,  hud_showtime,		0,	    CVAR_ARCHIVE);	// Show time on HUD
 CVAR (Int ,  hud_timecolor,		CR_GOLD,CVAR_ARCHIVE);	// Color of in-game time on HUD
 CVAR (Int ,  hud_showlag,		0, CVAR_ARCHIVE);		// Show input latency (maketic - gametic difference)
@@ -547,23 +548,37 @@ static int DrawAmmo(player_t *CPlayer, int x, int y)
 
 	orderedammos.Clear();
 
-	// Order ammo by use of weapons in the weapon slots
-	// Do not check for actual presence in the inventory!
-	// We want to show all ammo types that can be used by
-	// the weapons in the weapon slots.
-	for (k = 0; k < NUM_WEAPON_SLOTS; k++) for(j = 0; j < CPlayer->weapons.Slots[k].Size(); j++)
+	if (0 == hud_showammo)
 	{
-		const PClass *weap = CPlayer->weapons.Slots[k].GetWeapon(j);
-
-		if (weap) AddAmmoToList((AWeapon*)GetDefaultByType(weap));
+		// Show ammo for current weapon if any
+		if (wi) AddAmmoToList(wi);
 	}
-
-	// Now check for the remaining weapons that are in the inventory but not in the weapon slots
-	for(inv=CPlayer->mo->Inventory;inv;inv=inv->Inventory)
+	else
 	{
-		if (inv->IsKindOf(RUNTIME_CLASS(AWeapon)))
+		// Order ammo by use of weapons in the weapon slots
+		for (k = 0; k < NUM_WEAPON_SLOTS; k++) for(j = 0; j < CPlayer->weapons.Slots[k].Size(); j++)
 		{
-			AddAmmoToList((AWeapon*)inv);
+			const PClass *weap = CPlayer->weapons.Slots[k].GetWeapon(j);
+
+			if (weap)
+			{
+				// Show ammo for available weapons if hud_showammo CVAR is 1
+				// or show ammo for all weapons if hud_showammo is greater than 1
+				
+				if (hud_showammo > 1 || CPlayer->mo->FindInventory(weap))
+				{
+					AddAmmoToList((AWeapon*)GetDefaultByType(weap));
+				}
+			}
+		}
+
+		// Now check for the remaining weapons that are in the inventory but not in the weapon slots
+		for(inv=CPlayer->mo->Inventory;inv;inv=inv->Inventory)
+		{
+			if (inv->IsKindOf(RUNTIME_CLASS(AWeapon)))
+			{
+				AddAmmoToList((AWeapon*)inv);
+			}
 		}
 	}
 

From bd93ce63a9ea931c1adc1e903fe9623012210467 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sun, 8 Feb 2015 11:08:52 +0200
Subject: [PATCH 2/2] Added menu option to customize ammo display in
 alternative HUD

---
 wadsrc/static/menudef.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt
index 978480e4d..58240440d 100644
--- a/wadsrc/static/menudef.txt
+++ b/wadsrc/static/menudef.txt
@@ -795,6 +795,13 @@ OptionValue "AltHUDScale"
 	2, "Pixel double"
 }
 
+OptionValue "AltHUDAmmo"
+{
+	0, "Current weapon"
+	1, "Available weapons"
+	2, "All weapons"
+}
+
 OptionValue "AltHUDTime"
 {
 	0, "Off"
@@ -828,6 +835,7 @@ OptionMenu "AltHUDOptions"
 	Option "Show stamina and accuracy",				"hud_showstats", "OnOff"
 	Option "Show berserk",							"hud_berserk_health", "OnOff"
 	Option "Show weapons",							"hud_showweapons", "OnOff"
+	Option "Show ammo for",							"hud_showammo", "AltHUDAmmo"
 	Option "Show time",								"hud_showtime", "AltHUDTime"
 	Option "Time color",							"hud_timecolor", "TextColors"
 	Option "Show network latency",					"hud_showlag", "AltHUDLag"