zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-29 07:12:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: The Hexen status bar still uses MAX_MANA for some calculations instead

Browse source 
of MaxAmount.



SVN r1630 (trunk)
This commit is contained in:
Christoph Oelckers 2009-06-02 17:42:52 +00:00
parent 5061e2e8fd
commit 2ab76070c0
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/rh-log.txt
View file

@ -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. - Added Blzut3's submission for displaying underwater stats in SBARINFO.
May 31, 2009 (Changes by Graf Zahl) May 31, 2009 (Changes by Graf Zahl)

2
src/g_hexen/hexen_sbar.cpp
View file

@ -100,7 +100,7 @@ void FManaBar::SetVial (FTexture *pic, AActor *actor, const PClass *manaType)
ammo = actor->FindInventory (manaType); ammo = actor->FindInventory (manaType);
level = ammo != NULL ? ammo->Amount : 0; 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) if (VialPic != pic || VialLevel != level)
{ {
VialPic = pic; VialPic = pic;

2
src/g_shared/a_pickups.h
View file

@ -5,8 +5,6 @@
#include "info.h" #include "info.h"
#include "s_sound.h" #include "s_sound.h"
#define MAX_MANA 200
#define NUM_WEAPON_SLOTS 10 #define NUM_WEAPON_SLOTS 10
class player_t; class player_t;