lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make gray/black text prompt backcolor darker in OpenGL

This commit is contained in:
mazmazz 2018-11-09 22:47:42 -05:00
parent 7daf5d4727
commit 9ee894f777
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dehacked.c
View File

@ -1666,9 +1666,10 @@ static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
textprompts[num]->page[pagenum].lines = usi;
else if (fastcmp(word, "BACKCOLOR"))
{
UINT8 backcolor;
INT32 backcolor;
if (i == 0 || fastcmp(word2, "WHITE")) backcolor = 0;
else if (i == 1 || fastcmp(word2, "GRAY") || fastcmp(word2, "GREY")) backcolor = 1;
else if (i == 1 || fastcmp(word2, "GRAY") || fastcmp(word2, "GREY") ||
fastcmp(word2, "BLACK")) backcolor = 1;
else if (i == 2 || fastcmp(word2, "BROWN")) backcolor = 2;
else if (i == 3 || fastcmp(word2, "RED")) backcolor = 3;
else if (i == 4 || fastcmp(word2, "ORANGE")) backcolor = 4;
@ -1678,8 +1679,8 @@ static void readtextpromptpage(MYFILE *f, INT32 num, INT32 pagenum)
else if (i == 8 || fastcmp(word2, "PURPLE")) backcolor = 8;
else if (i == 9 || fastcmp(word2, "MAGENTA")) backcolor = 9;
else if (i == 10 || fastcmp(word2, "AQUA")) backcolor = 10;
else if (i < 0) backcolor = UINT8_MAX; // CONS_BACKCOLOR user-configured
else backcolor = 11; // default green
else if (i < 0) backcolor = INT32_MAX; // CONS_BACKCOLOR user-configured
else backcolor = 1; // default gray
textprompts[num]->page[pagenum].backcolor = backcolor;
}
else if (fastcmp(word, "ALIGN"))

2
src/hardware/hw_draw.c
View File

@ -726,7 +726,7 @@ void HWR_DrawTutorialBack(UINT32 color, INT32 boxheight)
v[2].tow = v[3].tow = 0.0f;
Surf.FlatColor.rgba = UINT2RGBA(color);
Surf.FlatColor.s.alpha = 0x80;
Surf.FlatColor.s.alpha = (color == 0 ? 0xC0 : 0x80); // make black darker, like software
HWD.pfnDrawPolygon(&Surf, v, 4, PF_NoTexture|PF_Modulated|PF_Translucent|PF_NoDepthTest);
}

2
src/v_video.c
View File

@ -1497,7 +1497,7 @@ void V_DrawPromptBack(INT32 boxheight, INT32 color)
switch (color)
{
case 0: hwcolor = 0xffffff00; break; // White
case 1: hwcolor = 0x80808000; break; // Gray
case 1: hwcolor = 0x00000000; break; // Gray // Note this is different from V_DrawFadeConsBack
case 2: hwcolor = 0x40201000; break; // Brown
case 3: hwcolor = 0xff000000; break; // Red
case 4: hwcolor = 0xff800000; break; // Orange