From 2ab76070c0422f9e44902cc79036388451a74deb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Tue, 2 Jun 2009 17:42:52 +0000
Subject: [PATCH] - Fixed: The Hexen status bar still uses MAX_MANA for some
 calculations instead   of MaxAmount.

SVN r1630 (trunk)
---
 docs/rh-log.txt            | 6 +++++-
 src/g_hexen/hexen_sbar.cpp | 2 +-
 src/g_shared/a_pickups.h   | 2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 8c6168fb9..00505a707 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,4 +1,8 @@
-June 1, 2009  (Changes by Graf Zahl)
+June 2, 2009  (Changes by Graf Zahl)
+- Fixed: The Hexen status bar still uses MAX_MANA for some calculations instead
+  of MaxAmount.
+
+June 1, 2009  (Changes by Graf Zahl)
 - Added Blzut3's submission for displaying underwater stats in SBARINFO.
 
 May 31, 2009  (Changes by Graf Zahl)
diff --git a/src/g_hexen/hexen_sbar.cpp b/src/g_hexen/hexen_sbar.cpp
index 75dc0f230..2ec3d5e65 100644
--- a/src/g_hexen/hexen_sbar.cpp
+++ b/src/g_hexen/hexen_sbar.cpp
@@ -100,7 +100,7 @@ void FManaBar::SetVial (FTexture *pic, AActor *actor, const PClass *manaType)
 
 	ammo = actor->FindInventory (manaType);
 	level = ammo != NULL ? ammo->Amount : 0;
-	level = MIN (22*level/MAX_MANA, 22);
+	level = MIN (22*level/ammo->MaxAmount, 22);
 	if (VialPic != pic || VialLevel != level)
 	{
 		VialPic = pic;
diff --git a/src/g_shared/a_pickups.h b/src/g_shared/a_pickups.h
index 99a77bdaf..620db6549 100644
--- a/src/g_shared/a_pickups.h
+++ b/src/g_shared/a_pickups.h
@@ -5,8 +5,6 @@
 #include "info.h"
 #include "s_sound.h"
 
-#define MAX_MANA				200
-
 #define NUM_WEAPON_SLOTS		10
 
 class player_t;