zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed: Popups weren't shown on the alt hud. 

SVN r4030 (trunk)
This commit is contained in:
Braden Obrzut 2013-01-21 21:02:14 +00:00
parent 76b5757dab
commit e86f27a7a6
4 changed files with 52 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/d_main.cpp
View File

@ -803,9 +803,10 @@ void D_Display ()
if (hud_althud && viewheight == SCREENHEIGHT && screenblocks > 10) if (hud_althud && viewheight == SCREENHEIGHT && screenblocks > 10)
{ {
StatusBar->DrawBottomStuff (HUD_None); StatusBar->DrawBottomStuff (HUD_AltHud);
if (DrawFSHUD || automapactive) DrawHUD(); if (DrawFSHUD || automapactive) DrawHUD();
StatusBar->DrawTopStuff (HUD_None); StatusBar->Draw (HUD_AltHud);
StatusBar->DrawTopStuff (HUD_AltHud);
} }
else else
if (viewheight == SCREENHEIGHT && viewactive && screenblocks > 10) if (viewheight == SCREENHEIGHT && viewactive && screenblocks > 10)

4
src/g_shared/sbar.h
View File

@ -48,7 +48,9 @@ enum EHudState
{ {
HUD_StatusBar, HUD_StatusBar,
HUD_Fullscreen, HUD_Fullscreen,
HUD_None HUD_None,
HUD_AltHud // Used for passing through popups to the alt hud
}; };
class AWeapon; class AWeapon;

56
src/g_shared/sbarinfo.cpp
View File

@ -1040,37 +1040,41 @@ public:
//prepare ammo counts //prepare ammo counts
GetCurrentAmmo(ammo1, ammo2, ammocount1, ammocount2); GetCurrentAmmo(ammo1, ammo2, ammocount1, ammocount2);
armor = CPlayer->mo->FindInventory<ABasicArmor>(); armor = CPlayer->mo->FindInventory<ABasicArmor>();
if(hud != lastHud)
{
script->huds[hud]->Tick(NULL, this, true);
// Restore scaling if need be. if(state != HUD_AltHud)
if(scalingWasForced) {
if(hud != lastHud)
{ {
scalingWasForced = false; script->huds[hud]->Tick(NULL, this, true);
SetScaled(false);
setsizeneeded = true; // Restore scaling if need be.
if(scalingWasForced)
{
scalingWasForced = false;
SetScaled(false);
setsizeneeded = true;
}
} }
}
if(currentPopup != POP_None && !script->huds[hud]->FullScreenOffsets()) if(currentPopup != POP_None && !script->huds[hud]->FullScreenOffsets())
script->huds[hud]->Draw(NULL, this, script->popups[currentPopup-1].getXDisplacement(), script->popups[currentPopup-1].getYDisplacement(), FRACUNIT); script->huds[hud]->Draw(NULL, this, script->popups[currentPopup-1].getXDisplacement(), script->popups[currentPopup-1].getYDisplacement(), FRACUNIT);
else
script->huds[hud]->Draw(NULL, this, 0, 0, FRACUNIT);
lastHud = hud;
// Handle inventory bar drawing
if(CPlayer->inventorytics > 0 && !(level.flags & LEVEL_NOINVENTORYBAR) && (state == HUD_StatusBar || state == HUD_Fullscreen))
{
SBarInfoMainBlock *inventoryBar = state == HUD_StatusBar ? script->huds[STBAR_INVENTORY] : script->huds[STBAR_INVENTORYFULLSCREEN];
if(inventoryBar != lastInventoryBar)
inventoryBar->Tick(NULL, this, true);
// No overlay? Lets cancel it.
if(inventoryBar->NumCommands() == 0)
CPlayer->inventorytics = 0;
else else
inventoryBar->DrawAux(NULL, this, 0, 0, FRACUNIT); script->huds[hud]->Draw(NULL, this, 0, 0, FRACUNIT);
lastHud = hud;
// Handle inventory bar drawing
if(CPlayer->inventorytics > 0 && !(level.flags & LEVEL_NOINVENTORYBAR) && (state == HUD_StatusBar || state == HUD_Fullscreen))
{
SBarInfoMainBlock *inventoryBar = state == HUD_StatusBar ? script->huds[STBAR_INVENTORY] : script->huds[STBAR_INVENTORYFULLSCREEN];
if(inventoryBar != lastInventoryBar)
inventoryBar->Tick(NULL, this, true);
// No overlay? Lets cancel it.
if(inventoryBar->NumCommands() == 0)
CPlayer->inventorytics = 0;
else
inventoryBar->DrawAux(NULL, this, 0, 0, FRACUNIT);
}
} }
// Handle popups // Handle popups

29
src/g_strife/strife_sbar.cpp
View File

@ -222,12 +222,7 @@ public:
{ {
DBaseStatusBar::Draw (state); DBaseStatusBar::Draw (state);
if (state == HUD_Fullscreen) if (state == HUD_StatusBar)
{
SB_state = screen->GetPageCount ();
DrawFullScreenStuff ();
}
else if (state == HUD_StatusBar)
{ {
if (SB_state != 0) if (SB_state != 0)
{ {
@ -235,6 +230,20 @@ public:
} }
DrawMainBar (); DrawMainBar ();
} }
else
{
if (state == HUD_Fullscreen)
{
SB_state = screen->GetPageCount ();
DrawFullScreenStuff ();
}
// Draw pop screen (log, keys, and status)
if (CurrentPop != POP_None && PopHeight < 0)
{
DrawPopScreen (screen->GetHeight());
}
}
} }
void ShowPop (int popnum) void ShowPop (int popnum)
@ -279,7 +288,7 @@ public:
bool MustDrawLog(EHudState state) bool MustDrawLog(EHudState state)
{ {
// Tell the base class to draw the log if the pop screen won't be displayed. // Tell the base class to draw the log if the pop screen won't be displayed.
return (state == HUD_None); return false;
} }
private: private:
@ -554,12 +563,6 @@ private:
} }
} }
} }
// Draw pop screen (log, keys, and status)
if (CurrentPop != POP_None && PopHeight < 0)
{
DrawPopScreen (screen->GetHeight());
}
} }
void DrawPopScreen (int bottom) void DrawPopScreen (int bottom)