Merge branch 'tutboxgl' into 'master'
Tutorial Prompt in GL (resolves #349). Closes #349 See merge request STJr/SRB2Internal!544
This commit is contained in:
commit
1892ab0de5
|
@ -1902,14 +1902,15 @@ void V_DrawPromptBack(INT32 boxheight, INT32 color)
|
||||||
{
|
{
|
||||||
UINT8 *deststop, *buf;
|
UINT8 *deststop, *buf;
|
||||||
|
|
||||||
boxheight = ((boxheight * 4) + (boxheight/2)*5);
|
|
||||||
|
|
||||||
if (color >= 256 && color < 512)
|
if (color >= 256 && color < 512)
|
||||||
{
|
{
|
||||||
|
boxheight = ((boxheight * 4) + (boxheight/2)*5);
|
||||||
V_DrawFill((BASEVIDWIDTH-(vid.width/vid.dupx))/2, BASEVIDHEIGHT-boxheight, (vid.width/vid.dupx),boxheight, (color-256)|V_SNAPTOBOTTOM);
|
V_DrawFill((BASEVIDWIDTH-(vid.width/vid.dupx))/2, BASEVIDHEIGHT-boxheight, (vid.width/vid.dupx),boxheight, (color-256)|V_SNAPTOBOTTOM);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
boxheight *= vid.dupy;
|
||||||
|
|
||||||
if (color == INT32_MAX)
|
if (color == INT32_MAX)
|
||||||
color = cons_backcolor.value;
|
color = cons_backcolor.value;
|
||||||
|
|
||||||
|
@ -1951,7 +1952,7 @@ void V_DrawPromptBack(INT32 boxheight, INT32 color)
|
||||||
// heavily simplified -- we don't need to know x or y position,
|
// heavily simplified -- we don't need to know x or y position,
|
||||||
// just the start and stop positions
|
// just the start and stop positions
|
||||||
deststop = screens[0] + vid.rowbytes * vid.height;
|
deststop = screens[0] + vid.rowbytes * vid.height;
|
||||||
buf = deststop - vid.rowbytes * boxheight * vid.dupy; // 4 lines of space plus gaps between and some leeway
|
buf = deststop - vid.rowbytes * ((boxheight * 4) + (boxheight/2)*5); // 4 lines of space plus gaps between and some leeway
|
||||||
for (; buf < deststop; ++buf)
|
for (; buf < deststop; ++buf)
|
||||||
*buf = promptbgmap[*buf];
|
*buf = promptbgmap[*buf];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue