diff --git a/src/v_video.c b/src/v_video.c index e39663a7..58115e02 100644 --- a/src/v_video.c +++ b/src/v_video.c @@ -1755,8 +1755,9 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string) case V_OLDSPACING: charwidth = 5; break; - case V_6WIDTHSPACE: - spacewidth = 3; + // Out of video flags, so we're reusing this for alternate charwidth instead + /*case V_6WIDTHSPACE: + spacewidth = 3;*/ default: break; } @@ -1798,7 +1799,8 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string) if (charwidth) w = charwidth * dupx; else - w = (SHORT(tny_font[c]->width) * dupx); + w = ((option & V_6WIDTHSPACE ? max(1, SHORT(tny_font[c]->width)-1) // Reuse this flag for the alternate bunched-up spacing + : SHORT(tny_font[c]->width)) * dupx); if (cx > scrwidth) break; @@ -2220,8 +2222,9 @@ INT32 V_ThinStringWidth(const char *string, INT32 option) case V_OLDSPACING: charwidth = 5; break; - case V_6WIDTHSPACE: - spacewidth = 3; + // Out of video flags, so we're reusing this for alternate charwidth instead + /*case V_6WIDTHSPACE: + spacewidth = 3;*/ default: break; } @@ -2236,7 +2239,8 @@ INT32 V_ThinStringWidth(const char *string, INT32 option) if (c < 0 || c >= HU_FONTSIZE || !tny_font[c]) w += spacewidth; else - w += (charwidth ? charwidth : SHORT(tny_font[c]->width)); + w += (charwidth ? charwidth + : (option & V_6WIDTHSPACE ? max(1, SHORT(tny_font[c]->width)-1) : SHORT(tny_font[c]->width))); // Reuse this flag for the alternate bunched-up spacing } return w; diff --git a/src/y_inter.c b/src/y_inter.c index 9416211a..e0d90327 100644 --- a/src/y_inter.c +++ b/src/y_inter.c @@ -1048,7 +1048,7 @@ void Y_VoteDrawer(void) } V_DrawSmallScaledPatch(BASEVIDWIDTH-100, y, V_SNAPTORIGHT, pic); - V_DrawRightAlignedThinString(BASEVIDWIDTH-20, 40+y, V_SNAPTORIGHT, str); + V_DrawRightAlignedThinString(BASEVIDWIDTH-22, 40+y, V_SNAPTORIGHT|V_6WIDTHSPACE, str); if (levelinfo[i].gts) { INT32 w = V_ThinStringWidth(levelinfo[i].gts, V_SNAPTORIGHT)+1;