diff --git a/docs/rh-log.txt b/docs/rh-log.txt index ff5f9fd73..0e225267e 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,5 @@ June 22, 2009 +- SBARINFO patch: Enable forcescaled with fullscreenoffsets. - Fixed: Since UDMF allows for fractional vertex coordinates, it is no longer safe for P_AlignPlane() to truncate coordinates when searching for the furthest vertex from the line. diff --git a/src/g_shared/sbarinfo_display.cpp b/src/g_shared/sbarinfo_display.cpp index be78f5d08..079052ff4 100644 --- a/src/g_shared/sbarinfo_display.cpp +++ b/src/g_shared/sbarinfo_display.cpp @@ -265,10 +265,13 @@ void DSBarInfo::Draw (EHudState state) { hud = STBAR_NONE; } + bool oldhud_scale = hud_scale; if(script->huds[hud].forceScaled) //scale the statusbar { SetScaled(true, true); setsizeneeded = true; + if(script->huds[hud].fullScreenOffsets) + hud_scale = true; } doCommands(script->huds[hud], 0, 0, script->huds[hud].alpha); 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(), 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 ()