diff --git a/src/v_video.c b/src/v_video.c
index 161c03d0b38af9c8ea1f0f525ff7313e712d0df8..7541402ac142a05577d3f00de457499984673771 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -418,7 +418,7 @@ void V_DrawFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t
if (scrn & V_FLIP)
{
flip = true;
- x -= FixedMul((SHORT(patch->width) - SHORT(patch->leftoffset))<<FRACBITS, pscale);
+ x -= FixedMul((SHORT(patch->width) - SHORT(patch->leftoffset))<<FRACBITS, pscale) + 1;
}
else
x -= FixedMul(SHORT(patch->leftoffset)<<FRACBITS, pscale);
@@ -446,37 +446,38 @@ void V_DrawFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t
y = FixedMul(y,dupy<<FRACBITS);
x >>= FRACBITS;
y >>= FRACBITS;
- desttop += (y*vid.width) + x;
// Center it if necessary
if (!(scrn & V_SCALEPATCHMASK))
{
+ // if it's meant to cover the whole screen, black out the rest
+ if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
+ {
+ column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
+ source = (const UINT8 *)(column) + 3;
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
+ }
if (vid.width != BASEVIDWIDTH * dupx)
{
// dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
// so center this imaginary screen
if (scrn & V_SNAPTORIGHT)
- desttop += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * dupx));
else if (!(scrn & V_SNAPTOLEFT))
- desttop += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
}
if (vid.height != BASEVIDHEIGHT * dupy)
{
// same thing here
if ((scrn & (V_SPLITSCREEN|V_SNAPTOBOTTOM)) == (V_SPLITSCREEN|V_SNAPTOBOTTOM))
- desttop += (vid.height/2 - (BASEVIDHEIGHT/2 * dupy)) * vid.width;
+ y += (vid.height/2 - (BASEVIDHEIGHT/2 * dupy)) * vid.width;
else if (scrn & V_SNAPTOBOTTOM)
- desttop += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width;
+ y += (vid.height - (BASEVIDHEIGHT * dupy));
else if (!(scrn & V_SNAPTOTOP))
- desttop += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width / 2;
- }
- // if it's meant to cover the whole screen, black out the rest
- if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
- {
- column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
- source = (const UINT8 *)(column) + 3;
- V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
+ y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
}
+
+ desttop += (y*vid.width) + x;
}
}
@@ -583,36 +584,37 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
y = FixedMul(y,dupy<<FRACBITS);
x >>= FRACBITS;
y >>= FRACBITS;
- desttop += (y*vid.width) + x;
// Center it if necessary
if (!(scrn & V_SCALEPATCHMASK))
{
+ // if it's meant to cover the whole screen, black out the rest
+ if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
+ {
+ column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
+ source = (const UINT8 *)(column) + 3;
+ V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
+ }
if (vid.width != BASEVIDWIDTH * dupx)
{
// dupx adjustments pretend that screen width is BASEVIDWIDTH * dupx,
// so center this imaginary screen
if (scrn & V_SNAPTORIGHT)
- desttop += (vid.width - (BASEVIDWIDTH * dupx));
+ x += (vid.width - (BASEVIDWIDTH * dupx));
else if (!(scrn & V_SNAPTOLEFT))
- desttop += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
+ x += (vid.width - (BASEVIDWIDTH * dupx)) / 2;
}
if (vid.height != BASEVIDHEIGHT * dupy)
{
// same thing here
if (scrn & V_SNAPTOBOTTOM)
- desttop += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width;
+ y += (vid.height - (BASEVIDHEIGHT * dupy));
else if (!(scrn & V_SNAPTOTOP))
- desttop += (vid.height - (BASEVIDHEIGHT * dupy)) * vid.width / 2;
- }
- // if it's meant to cover the whole screen, black out the rest
- if (x == 0 && SHORT(patch->width) == BASEVIDWIDTH && y == 0 && SHORT(patch->height) == BASEVIDHEIGHT)
- {
- column = (const column_t *)((const UINT8 *)(patch) + LONG(patch->columnofs[0]));
- source = (const UINT8 *)(column) + 3;
- V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, (column->topdelta == 0xff ? 31 : source[0]));
+ y += (vid.height - (BASEVIDHEIGHT * dupy)) / 2;
}
}
+
+ desttop += (y*vid.width) + x;
}
for (col = sx<<FRACBITS; (col>>FRACBITS) < SHORT(patch->width) && (col>>FRACBITS) < w; col += colfrac, ++x, desttop++)
@@ -776,7 +778,7 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
if (x == 0 && y == 0 && w == BASEVIDWIDTH && h == BASEVIDHEIGHT)
{ // Clear the entire screen, from dest to deststop. Yes, this really works.
- memset(screens[0], (UINT8)(c&255), vid.width * vid.height * vid.bpp);
+ memset(screens[0], (c&255), vid.width * vid.height * vid.bpp);
return;
}
@@ -831,7 +833,7 @@ void V_DrawFill(INT32 x, INT32 y, INT32 w, INT32 h, INT32 c)
c &= 255;
for (;(--h >= 0) && dest < deststop; dest += vid.width)
- memset(dest, (UINT8)(c&255), w * vid.bpp);
+ memset(dest, c, w * vid.bpp);
}
//
@@ -1129,7 +1131,7 @@ char *V_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
//
void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth = BASEVIDWIDTH, center = 0;
+ INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -1145,7 +1147,12 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
scrwidth = vid.width;
}
else
+ {
dupx = dupy = 1;
+ scrwidth = vid.width/vid.dupx;
+ left = (scrwidth - BASEVIDWIDTH)/2;
+ scrwidth -= left;
+ }
charflags = (option & V_CHARCOLORMASK);
@@ -1206,9 +1213,9 @@ void V_DrawString(INT32 x, INT32 y, INT32 option, const char *string)
else
w = SHORT(hu_font[c]->width) * dupx;
- if (cx + w > scrwidth)
+ if (cx > scrwidth)
break;
- if (cx < 0) //left boundary check
+ if (cx+left + w < 0) //left boundary check
{
cx += w;
continue;
@@ -1239,7 +1246,7 @@ void V_DrawRightAlignedString(INT32 x, INT32 y, INT32 option, const char *string
//
void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth = BASEVIDWIDTH, center = 0;
+ INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -1255,7 +1262,12 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
scrwidth = vid.width;
}
else
+ {
dupx = dupy = 1;
+ scrwidth = vid.width/vid.dupx;
+ left = (scrwidth - BASEVIDWIDTH)/2;
+ scrwidth -= left;
+ }
charflags = (option & V_CHARCOLORMASK);
@@ -1314,9 +1326,9 @@ void V_DrawSmallString(INT32 x, INT32 y, INT32 option, const char *string)
}
else
w = SHORT(hu_font[c]->width) * dupx / 2;
- if (cx + w > scrwidth)
+ if (cx > scrwidth)
break;
- if (cx < 0) //left boundary check
+ if (cx+left + w < 0) //left boundary check
{
cx += w;
continue;
@@ -1341,7 +1353,7 @@ void V_DrawRightAlignedSmallString(INT32 x, INT32 y, INT32 option, const char *s
//
void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth = BASEVIDWIDTH;
+ INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, left = 0;
const char *ch = string;
INT32 charflags = 0;
const UINT8 *colormap = NULL;
@@ -1357,7 +1369,12 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
scrwidth = vid.width;
}
else
+ {
dupx = dupy = 1;
+ scrwidth = vid.width/vid.dupx;
+ left = (scrwidth - BASEVIDWIDTH)/2;
+ scrwidth -= left;
+ }
charflags = (option & V_CHARCOLORMASK);
@@ -1414,9 +1431,9 @@ void V_DrawThinString(INT32 x, INT32 y, INT32 option, const char *string)
else
w = (SHORT(tny_font[c]->width) * dupx);
- if (cx + w > scrwidth)
+ if (cx > scrwidth)
break;
- if (cx < 0) //left boundary check
+ if (cx+left + w < 0) //left boundary check
{
cx += w;
continue;
@@ -1439,7 +1456,7 @@ void V_DrawRightAlignedThinString(INT32 x, INT32 y, INT32 option, const char *st
void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
{
fixed_t cx = x, cy = y;
- INT32 w, c, dupx, dupy, scrwidth = BASEVIDWIDTH, center = 0;
+ INT32 w, c, dupx, dupy, scrwidth, center = 0, left = 0;
const char *ch = string;
INT32 spacewidth = 4, charwidth = 0;
@@ -1453,7 +1470,12 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
scrwidth = vid.width;
}
else
+ {
dupx = dupy = 1;
+ scrwidth = vid.width/vid.dupx;
+ left = (scrwidth - BASEVIDWIDTH)/2;
+ scrwidth -= left;
+ }
switch (option & V_SPACINGMASK)
{
@@ -1507,9 +1529,9 @@ void V_DrawStringAtFixed(fixed_t x, fixed_t y, INT32 option, const char *string)
else
w = SHORT(hu_font[c]->width) * dupx;
- if ((cx>>FRACBITS) + w > scrwidth)
+ if ((cx>>FRACBITS) > scrwidth)
break;
- if (cx < 0) //left boundary check
+ if ((cx>>FRACBITS)+left + w < 0) //left boundary check
{
cx += w<<FRACBITS;
continue;
@@ -1609,7 +1631,7 @@ void V_DrawCreditString(fixed_t x, fixed_t y, INT32 option, const char *string)
}
w = SHORT(cred_font[c]->width) * dupx;
- if ((cx>>FRACBITS) + w > scrwidth)
+ if ((cx>>FRACBITS) > scrwidth)
break;
V_DrawSciencePatch(cx, cy, option, cred_font[c], FRACUNIT);
@@ -1645,7 +1667,7 @@ INT32 V_CreditStringWidth(const char *string)
//
void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
{
- INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth = BASEVIDWIDTH;
+ INT32 w, c, cx = x, cy = y, dupx, dupy, scrwidth, left = 0;
const char *ch = string;
if (option & V_NOSCALESTART)
@@ -1655,7 +1677,12 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
scrwidth = vid.width;
}
else
+ {
dupx = dupy = 1;
+ scrwidth = vid.width/vid.dupx;
+ left = (scrwidth - BASEVIDWIDTH)/2;
+ scrwidth -= left;
+ }
for (;;)
{
@@ -1677,11 +1704,10 @@ void V_DrawLevelTitle(INT32 x, INT32 y, INT32 option, const char *string)
}
w = SHORT(lt_font[c]->width) * dupx;
- if (cx + w > scrwidth)
+ if (cx > scrwidth)
break;
+ if (cx+left + w < 0) //left boundary check
- //left boundary check
- if (cx < 0)
{
cx += w;
continue;