mirror of
https://github.com/fabiangreffrath/woof.git
synced 2025-09-24 04:29:34 -04:00
parametrize the dark/shaded color translation table
This commit is contained in:
parent
e2444ba859
commit
cebc872986
@ -4577,7 +4577,7 @@ void M_DrawString(int cx, int cy, int color, const char* ch)
|
||||
|
||||
void M_DrawStringDisable(int cx, int cy, const char* ch)
|
||||
{
|
||||
return M_DrawStringCR(cx, cy, (char *)&colormaps[0][256*15], ch);
|
||||
return M_DrawStringCR(cx, cy, cr_dark, ch);
|
||||
}
|
||||
|
||||
// cph 2006/08/06 - M_DrawString() is the old M_DrawMenuString, except that it is not tied to menu_buffer
|
||||
@ -6067,7 +6067,7 @@ void M_Drawer (void)
|
||||
char *alttext = currentMenu->menuitems[i].alttext;
|
||||
if (alttext)
|
||||
M_DrawStringCR(x, y+8-(M_StringHeight(alttext)/2),
|
||||
currentMenu->menuitems[i].status == 0 ? (char *)&colormaps[0][256*15] : cr_red,alttext);
|
||||
currentMenu->menuitems[i].status == 0 ? cr_dark : cr_red,alttext);
|
||||
y += LINEHEIGHT;
|
||||
}
|
||||
}
|
||||
@ -6077,7 +6077,7 @@ void M_Drawer (void)
|
||||
if (currentMenu->menuitems[i].name[0])
|
||||
V_DrawPatchTranslated(x,y,0,
|
||||
W_CacheLumpName(currentMenu->menuitems[i].name,PU_CACHE),
|
||||
currentMenu->menuitems[i].status == 0 ? (char *)&colormaps[0][256*15] : cr_red,0);
|
||||
currentMenu->menuitems[i].status == 0 ? cr_dark : cr_red,0);
|
||||
y += LINEHEIGHT;
|
||||
}
|
||||
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include "r_sky.h"
|
||||
#include "d_io.h"
|
||||
#include "m_argv.h" // M_CheckParm()
|
||||
#include "v_video.h" // cr_dark
|
||||
|
||||
#ifdef _WIN32
|
||||
#include "../win32/win_fopen.h"
|
||||
@ -831,6 +832,9 @@ void R_InitColormaps(void)
|
||||
|
||||
for (i=1; i<numcolormaps; i++)
|
||||
colormaps[i] = W_CacheLumpNum(i+firstcolormaplump, PU_STATIC);
|
||||
|
||||
// [FG] dark/shaded color translation table
|
||||
cr_dark = (char *)&colormaps[0][256*15];
|
||||
}
|
||||
|
||||
// killough 4/4/98: get colormap number from name
|
||||
|
@ -58,6 +58,8 @@ char *cr_yellow;
|
||||
char *cr_black;
|
||||
char *cr_purple;
|
||||
char *cr_white;
|
||||
// [FG] dark/shaded color translation table
|
||||
char *cr_dark;
|
||||
|
||||
//jff 4/24/98 initialize this at runtime
|
||||
char *colrngs[CR_LIMIT];
|
||||
|
@ -64,6 +64,8 @@ extern char *cr_yellow;
|
||||
extern char *cr_black;
|
||||
extern char *cr_purple;
|
||||
extern char *cr_white;
|
||||
// [FG] dark/shaded color translation table
|
||||
extern char *cr_dark;
|
||||
|
||||
// array of pointers to color translation tables
|
||||
extern char *colrngs[];
|
||||
|
Loading…
x
Reference in New Issue
Block a user