diff --git a/source/games/duke/src/sbar_d.cpp b/source/games/duke/src/sbar_d.cpp index 3a6ebacfb..fa5b3f84f 100644 --- a/source/games/duke/src/sbar_d.cpp +++ b/source/games/duke/src/sbar_d.cpp @@ -120,11 +120,12 @@ public: FGameTexture* img; double imgScale; double baseScale = (scale * numberFont.mFont->GetHeight()) * 0.7; + double texty = -numberFont.mFont->GetHeight() + (isNamWW2GI() ? 2 : 4.5); // // Health // - img = tileGetTexture(COLA); + img = tileGetTexture(isNamWW2GI()? FIRSTAID_ICON : COLA); imgScale = baseScale / img->GetDisplayHeight(); DrawGraphic(img, 2, -1.5, DI_ITEM_LEFT_BOTTOM, 1., -1, -1, imgScale, imgScale); @@ -136,7 +137,7 @@ public: int intens = clamp(255 - 4 * s, 0, 255); auto pe = PalEntry(255, intens, intens, intens); format.Format("%d", p->last_extra); - SBar_DrawString(this, &numberFont, format, 25, -numberFont.mFont->GetHeight() + 4.5, DI_TEXT_ALIGN_LEFT, CR_UNTRANSLATED, 1, 0, 0, 1, 1); + SBar_DrawString(this, &numberFont, format, 25, texty, DI_TEXT_ALIGN_LEFT, CR_UNTRANSLATED, 1, 0, 0, 1, 1); } // @@ -147,7 +148,7 @@ public: DrawGraphic(img, 67.375, -1.5, DI_ITEM_LEFT_BOTTOM, 1., -1, -1, imgScale, imgScale); format.Format("%d", GetMoraleOrShield(p, snum)); - SBar_DrawString(this, &numberFont, format, 85, -numberFont.mFont->GetHeight() + 4.5, DI_TEXT_ALIGN_LEFT, CR_UNTRANSLATED, 1, 0, 0, 1, 1); + SBar_DrawString(this, &numberFont, format, 85, texty, DI_TEXT_ALIGN_LEFT, CR_UNTRANSLATED, 1, 0, 0, 1, 1); // // Weapon @@ -171,7 +172,7 @@ public: if (p->curr_weapon != KNEE_WEAPON && (!althud_flashing || (int)totalclock & 32 || p->ammo_amount[weapon] > (max_ammo_amount[weapon] / 10))) { - SBar_DrawString(this, &numberFont, format, -3, -numberFont.mFont->GetHeight() + 4.5, DI_TEXT_ALIGN_RIGHT, CR_UNTRANSLATED, 1, 0, 0, 1, 1); + SBar_DrawString(this, &numberFont, format, -3, texty, DI_TEXT_ALIGN_RIGHT, CR_UNTRANSLATED, 1, 0, 0, 1, 1); } DrawGraphic(img, -imgX, -1.5, DI_ITEM_RIGHT_BOTTOM, 1, -1, -1, imgScale, imgScale); diff --git a/wadsrc/static/engine/menudef.txt b/wadsrc/static/engine/menudef.txt index 9b11692b0..7feb6ad04 100644 --- a/wadsrc/static/engine/menudef.txt +++ b/wadsrc/static/engine/menudef.txt @@ -1027,7 +1027,7 @@ OptionMenu "HUDOptions" //protected Slider "$DSPLYMNU_SBSCALE", "hud_scale", 36, 100, 0.04, 2 StaticText "" Option "$DSPLYMNU_LEVELSTATS", "hud_stats", "OnOff" - Slider "$DSPLYMNU_STATSCALE", "hud_statscale", .5, 3, 0.25, 2 + Slider "$DSPLYMNU_STATSCALE", "hud_statscale", 36, 100, 0.04, 2 //Slider "$DSPLYMNU_TEXTSCALE", "hud_textscale", 100, 400, 20, 2