zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-16 01:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed DrawSelectedInventory's alternateonempty flag to draw the subblock before itself. This allows an else statement to be more useful in practice.

Browse source 
- Fixed: Added offsets to the wrong variable in SBarInfo.

SVN r2348 (trunk)
This commit is contained in:
Braden Obrzut 2010-05-30 18:34:59 +00:00
parent 5535f98218
commit 9716e1aea7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/g_shared/sbarinfo.cpp
View file

@ -1115,12 +1115,12 @@ public:
if((offsetflags & SBarInfoCommand::CENTER) == SBarInfoCommand::CENTER)
{
x -= (texture->GetScaledWidthDouble()/2.0)-texture->LeftOffset;
y -= (texture->GetScaledHeightDouble()/2.0)-texture->TopOffset;
dx -= (texture->GetScaledWidthDouble()/2.0)-texture->LeftOffset;
dy -= (texture->GetScaledHeightDouble()/2.0)-texture->TopOffset;
}
x += xOffset;
y += yOffset;
dx += xOffset;
dy += yOffset;
double w, h;
if(!fullScreenOffsets)
{

6
src/g_shared/sbarinfo_commands.cpp
View file

@ -1202,6 +1202,9 @@ class CommandDrawSelectedInventory : public SBarInfoCommandFlowControl, private
void Draw(const SBarInfoMainBlock *block, const DSBarInfo *statusBar)
{
if(alternateOnEmpty)
SBarInfoCommandFlowControl::Draw(block, statusBar);
if(statusBar->CPlayer->mo->InvSel != NULL && !(level.flags & LEVEL_NOINVENTORYBAR))
{
if(artiflash && artiflashTick)
@ -1214,9 +1217,6 @@ class CommandDrawSelectedInventory : public SBarInfoCommandFlowControl, private
if(alwaysShowCounter || statusBar->CPlayer->mo->InvSel->Amount != 1)
CommandDrawNumber::Draw(block, statusBar);
}
if(alternateOnEmpty)
SBarInfoCommandFlowControl::Draw(block, statusBar);
}
void Parse(FScanner &sc, bool fullScreenOffsets)
{