stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-26 03:00:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Brown text colormap instead of teal, revert sky-blue

Browse source
This commit is contained in:
TehRealSalt 2018-10-04 18:07:56 -04:00
parent 744c41bc8a
commit 6bae5e952b
6 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/console.c
View file

@ -156,7 +156,7 @@ static CV_PossibleValue_t menuhighlight_cons_t[] =
{V_TEAMAP, "Always tea-green"}, {V_TEAMAP, "Always tea-green"},
{V_STEELMAP, "Always steel-blue"}, {V_STEELMAP, "Always steel-blue"},
{V_PINKMAP, "Always pink"}, {V_PINKMAP, "Always pink"},
{V_TEALMAP, "Always teal"}, {V_BROWNMAP, "Always brown"},
{V_PEACHMAP, "Always peach"}, {V_PEACHMAP, "Always peach"},
{0, NULL} {0, NULL}
}; };
@ -291,7 +291,7 @@ static void CONS_backcolor_Change(void)
// TODO: This could probably be improved somehow... // TODO: This could probably be improved somehow...
// These colormaps are 99% identical, with just a few changed bytes // These colormaps are 99% identical, with just a few changed bytes
UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\ UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
*skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *tealmap, *peachmap; *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
static void CON_SetupColormaps(void) static void CON_SetupColormaps(void)
{ {
@ -311,8 +311,8 @@ static void CON_SetupColormaps(void)
teamap = (goldmap+256); teamap = (goldmap+256);
steelmap = (teamap+256); steelmap = (teamap+256);
pinkmap = (steelmap+256); pinkmap = (steelmap+256);
tealmap = (pinkmap+256); brownmap = (pinkmap+256);
peachmap = (tealmap+256); peachmap = (brownmap+256);
// setup the other colormaps, for console text // setup the other colormaps, for console text
@ -330,13 +330,13 @@ static void CON_SetupColormaps(void)
redmap[120] = (UINT8)126; // battle redmap[120] = (UINT8)126; // battle
graymap[120] = (UINT8)10; graymap[120] = (UINT8)10;
orangemap[120] = (UINT8)85; // record attack orangemap[120] = (UINT8)85; // record attack
skymap[120] = (UINT8)212; // race skymap[120] = (UINT8)214; // race
lavendermap[120] = (UINT8)248; lavendermap[120] = (UINT8)248;
goldmap[120] = (UINT8)114; goldmap[120] = (UINT8)114;
teamap[120] = (UINT8)177; teamap[120] = (UINT8)177;
steelmap[120] = (UINT8)201; steelmap[120] = (UINT8)201;
pinkmap[120] = (UINT8)144; pinkmap[120] = (UINT8)145;
tealmap[120] = (UINT8)220; brownmap[120] = (UINT8)48;
peachmap[120] = (UINT8)69; // nice peachmap[120] = (UINT8)69; // nice
// Init back colormap // Init back colormap

2
src/console.h
View file

@ -39,7 +39,7 @@ extern UINT32 con_scalefactor; // console text scale factor
extern consvar_t cons_backcolor, cons_menuhighlight; extern consvar_t cons_backcolor, cons_menuhighlight;
extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\ extern UINT8 *yellowmap, *purplemap, *greenmap, *bluemap, *graymap, *redmap, *orangemap,\
*skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *tealmap, *peachmap; *skymap, *goldmap, *lavendermap, *teamap, *steelmap, *pinkmap, *brownmap, *peachmap;
// Console bg color (auto updated to match) // Console bg color (auto updated to match)
extern UINT8 *consolebgmap; extern UINT8 *consolebgmap;

2
src/dehacked.c
View file

@ -8264,7 +8264,7 @@ struct {
{"V_TEAMAP",V_TEAMAP}, {"V_TEAMAP",V_TEAMAP},
{"V_STEELMAP",V_STEELMAP}, {"V_STEELMAP",V_STEELMAP},
{"V_PINKMAP",V_PINKMAP}, {"V_PINKMAP",V_PINKMAP},
{"V_TEALMAP",V_TEALMAP}, {"V_BROWNMAP",V_BROWNMAP},
{"V_PEACHMAP",V_PEACHMAP}, {"V_PEACHMAP",V_PEACHMAP},
{"V_TRANSLUCENT",V_TRANSLUCENT}, {"V_TRANSLUCENT",V_TRANSLUCENT},
{"V_10TRANS",V_10TRANS}, {"V_10TRANS",V_10TRANS},

6
src/hu_stuff.c
View file

@ -727,10 +727,10 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
const UINT8 color = players[playernum].skincolor; const UINT8 color = players[playernum].skincolor;
if (color <= SKINCOLOR_SILVER || color == SKINCOLOR_SLATE) if (color <= SKINCOLOR_SILVER || color == SKINCOLOR_SLATE)
cstart = "\x80"; // white cstart = "\x80"; // white
else if (color <= SKINCOLOR_BEIGE || color == SKINCOLOR_JET) else if (color <= SKINCOLOR_BLACK || color == SKINCOLOR_JET)
cstart = "\x86"; // V_GRAYMAP cstart = "\x86"; // V_GRAYMAP
else if (color <= SKINCOLOR_LEATHER) else if (color <= SKINCOLOR_LEATHER)
cstart = "\x8A"; // V_GOLDMAP cstart = "\x8e"; // V_BROWNMAP
else if (color <= SKINCOLOR_ROSE || color == SKINCOLOR_LILAC) else if (color <= SKINCOLOR_ROSE || color == SKINCOLOR_LILAC)
cstart = "\x8d"; // V_PINKMAP cstart = "\x8d"; // V_PINKMAP
else if (color <= SKINCOLOR_KETCHUP) else if (color <= SKINCOLOR_KETCHUP)
@ -747,8 +747,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
cstart = "\x8b"; // V_TEAMAP cstart = "\x8b"; // V_TEAMAP
else if (color <= SKINCOLOR_DREAM || color == SKINCOLOR_LIME) else if (color <= SKINCOLOR_DREAM || color == SKINCOLOR_LIME)
cstart = "\x83"; // V_GREENMAP cstart = "\x83"; // V_GREENMAP
else if (color <= SKINCOLOR_TEAL)
cstart = "\x8e"; // V_TEALMAP
else if (color <= SKINCOLOR_NAVY || color == SKINCOLOR_SAPPHIRE) else if (color <= SKINCOLOR_NAVY || color == SKINCOLOR_SAPPHIRE)
cstart = "\x88"; // V_SKYMAP cstart = "\x88"; // V_SKYMAP
else if (color <= SKINCOLOR_STEEL) else if (color <= SKINCOLOR_STEEL)

4
src/v_video.c
View file

@ -1282,8 +1282,8 @@ UINT8 *V_GetStringColormap(INT32 colorflags)
return steelmap; return steelmap;
case 13: // 0x8D, pink case 13: // 0x8D, pink
return pinkmap; return pinkmap;
case 14: // 0x8E, teal case 14: // 0x8E, brown
return tealmap; return brownmap;
case 15: // 0x8F, peach case 15: // 0x8F, peach
return peachmap; return peachmap;
default: // reset default: // reset

2
src/v_video.h
View file

@ -82,7 +82,7 @@ extern UINT8 hudtrans;
#define V_TEAMAP 0x0000B000 #define V_TEAMAP 0x0000B000
#define V_STEELMAP 0x0000C000 #define V_STEELMAP 0x0000C000
#define V_PINKMAP 0x0000D000 #define V_PINKMAP 0x0000D000
#define V_TEALMAP 0x0000E000 #define V_BROWNMAP 0x0000E000
#define V_PEACHMAP 0x0000F000 #define V_PEACHMAP 0x0000F000
// use bits 17-20 for alpha transparency // use bits 17-20 for alpha transparency