- SBARINFO patch: Enable forcescaled with fullscreenoffsets.

SVN r1677 (trunk)
This commit is contained in:
Randy Heit 2009-06-23 02:48:20 +00:00
parent 861a955cef
commit 7161de7241
2 changed files with 6 additions and 0 deletions

View file

@ -1,4 +1,5 @@
June 22, 2009 June 22, 2009
- SBARINFO patch: Enable forcescaled with fullscreenoffsets.
- Fixed: Since UDMF allows for fractional vertex coordinates, it is no longer - Fixed: Since UDMF allows for fractional vertex coordinates, it is no longer
safe for P_AlignPlane() to truncate coordinates when searching for the safe for P_AlignPlane() to truncate coordinates when searching for the
furthest vertex from the line. furthest vertex from the line.

View file

@ -265,10 +265,13 @@ void DSBarInfo::Draw (EHudState state)
{ {
hud = STBAR_NONE; hud = STBAR_NONE;
} }
bool oldhud_scale = hud_scale;
if(script->huds[hud].forceScaled) //scale the statusbar if(script->huds[hud].forceScaled) //scale the statusbar
{ {
SetScaled(true, true); SetScaled(true, true);
setsizeneeded = true; setsizeneeded = true;
if(script->huds[hud].fullScreenOffsets)
hud_scale = true;
} }
doCommands(script->huds[hud], 0, 0, script->huds[hud].alpha); doCommands(script->huds[hud], 0, 0, script->huds[hud].alpha);
if(CPlayer->inventorytics > 0 && !(level.flags & LEVEL_NOINVENTORYBAR)) if(CPlayer->inventorytics > 0 && !(level.flags & LEVEL_NOINVENTORYBAR))
@ -301,6 +304,8 @@ void DSBarInfo::Draw (EHudState state)
doCommands(script->huds[popbar], script->popups[currentPopup-1].getXOffset(), script->popups[currentPopup-1].getYOffset(), doCommands(script->huds[popbar], script->popups[currentPopup-1].getXOffset(), script->popups[currentPopup-1].getYOffset(),
script->popups[currentPopup-1].getAlpha(script->huds[popbar].alpha)); script->popups[currentPopup-1].getAlpha(script->huds[popbar].alpha));
} }
if(script->huds[hud].forceScaled && script->huds[hud].fullScreenOffsets)
hud_scale = oldhud_scale;
} }
void DSBarInfo::NewGame () void DSBarInfo::NewGame ()