thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff

Browse source
This commit is contained in:
TehRealSalt 2019-05-12 17:19:49 -04:00
parent db5f8e8c6b
commit dc41fe3d8d
17 changed files with 92 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
src/console.c
View file

@ -131,12 +131,12 @@ static CV_PossibleValue_t backpic_cons_t[] = {{0, "translucent"}, {1, "picture"}
static consvar_t cons_backpic = {"con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static consvar_t cons_backpic = {"con_backpic", "translucent", CV_SAVE, backpic_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, {2, "Sepia"}, static CV_PossibleValue_t backcolor_cons_t[] = {{0, "White"}, {1, "Black"}, {2, "Sepia"},
{3, "Brown"}, {4, "Pink"}, {5, "Raspberry"}, {3, "Brown"}, {4, "Pink"}, {5, "Red"},
{6, "Red"}, {7, "Creamsicle"}, {8, "Orange"}, {6, "Orange"}, {7, "Gold"}, {8, "Yellow"},
{9, "Gold"}, {10,"Yellow"}, {11,"Emerald"}, {9, "Peridot"}, {10,"Green"}, {11,"Aquamarine"},
{12,"Green"}, {13,"Cyan"}, {14,"Steel"}, {12,"Cyan"}, {13,"Steel"}, {14,"Blue"},
{15,"Periwinkle"}, {16,"Blue"}, {17,"Purple"}, {15,"Purple"}, {16,"Magenta"}, {17,"Lavender"},
{18,"Lavender"}, {18,"Rose"},
{0, NULL}}; {0, NULL}};
consvar_t cons_backcolor = {"con_backcolor", "Black", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change, 0, NULL, NULL, 0, 0, NULL}; consvar_t cons_backcolor = {"con_backcolor", "Black", CV_CALL|CV_SAVE, backcolor_cons_t, CONS_backcolor_Change, 0, NULL, NULL, 0, 0, NULL};
@ -262,27 +262,27 @@ void CON_SetupBackColormap(void)
switch (cons_backcolor.value) switch (cons_backcolor.value)
{ {
case 0: palindex = 15; break; // White case 0: palindex = 15; break; // White
case 1: palindex = 31; break; // Gray case 1: palindex = 31; break; // Black
case 2: palindex = 47; break; // Sepia case 2: palindex = 251; break; // Sepia
case 3: palindex = 63; break; // Brown case 3: palindex = 239; break; // Brown
case 4: palindex = 150; shift = 7; break; // Pink case 4: palindex = 214; shift = 7; break; // Pink
case 5: palindex = 127; shift = 7; break; // Raspberry case 5: palindex = 47; break; // Red
case 6: palindex = 143; break; // Red case 6: palindex = 63; break; // Orange
case 7: palindex = 86; shift = 7; break; // Creamsicle case 7: palindex = 71; shift = 7; break; // Gold
case 8: palindex = 95; break; // Orange case 8: palindex = 79; shift = 7; break; // Yellow
case 9: palindex = 119; shift = 7; break; // Gold case 9: palindex = 191; shift = 8; break; // Peridot
case 10: palindex = 111; break; // Yellow case 10: palindex = 111; break; // Green
case 11: palindex = 191; shift = 7; break; // Emerald case 11: palindex = 127; shift = 7; break; // Aquamarine
case 12: palindex = 175; break; // Green case 12: palindex = 139; break; // Cyan
case 13: palindex = 219; break; // Cyan case 13: palindex = 175; shift = 7; break; // Steel
case 14: palindex = 207; shift = 7; break; // Steel case 14: palindex = 159; break; // Blue
case 15: palindex = 230; shift = 7; break; // Periwinkle case 15: palindex = 169; break; // Purple
case 16: palindex = 239; break; // Blue case 16: palindex = 187; break; // Magenta
case 17: palindex = 199; shift = 7; break; // Purple case 17: palindex = 199; shift = 7; break; // Lavender
case 18: palindex = 255; shift = 7; break; // Lavender case 18: palindex = 207; shift = 7; break; // Rose
// Default green // Default black
default: palindex = 175; break; default: palindex = 31; break;
} }
@ -335,21 +335,21 @@ static void CON_SetupColormaps(void)
*memorysrc = (UINT8)(i & 0xFF); // remap each color to itself... *memorysrc = (UINT8)(i & 0xFF); // remap each color to itself...
// SRB2Kart: Different console font, new colors // SRB2Kart: Different console font, new colors
purplemap[120] = (UINT8)194; purplemap[0] = (UINT8)182;
yellowmap[120] = (UINT8)103; yellowmap[0] = (UINT8)73;
greenmap[120] = (UINT8)162; greenmap[0] = (UINT8)98;
bluemap[120] = (UINT8)228; bluemap[0] = (UINT8)148;
redmap[120] = (UINT8)126; // battle redmap[0] = (UINT8)34; // battle
graymap[120] = (UINT8)10; graymap[0] = (UINT8)10;
orangemap[120] = (UINT8)85; // record attack orangemap[0] = (UINT8)52; // record attack
skymap[120] = (UINT8)214; // race skymap[0] = (UINT8)132; // race
lavendermap[120] = (UINT8)248; lavendermap[0] = (UINT8)192;
goldmap[120] = (UINT8)114; goldmap[0] = (UINT8)65;
teamap[120] = (UINT8)177; teamap[0] = (UINT8)89;
steelmap[120] = (UINT8)201; steelmap[0] = (UINT8)145;
pinkmap[120] = (UINT8)145; pinkmap[0] = (UINT8)210;
brownmap[120] = (UINT8)48; brownmap[0] = (UINT8)224;
peachmap[120] = (UINT8)69; // nice peachmap[0] = (UINT8)217; // no longer nice :(
// Init back colormap // Init back colormap
CON_SetupBackColormap(); CON_SetupBackColormap();
@ -1472,7 +1472,7 @@ static void CON_DrawInput(void)
{ {
x -= charwidth*3; x -= charwidth*3;
if (input_sel < c) if (input_sel < c)
V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART); V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 77 | V_NOSCALESTART);
for (i = 0; i < 3; ++i, x += charwidth) for (i = 0; i < 3; ++i, x += charwidth)
V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value); V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
} }
@ -1483,7 +1483,7 @@ static void CON_DrawInput(void)
{ {
if ((input_sel > c && input_cur <= c) || (input_sel <= c && input_cur > c)) if ((input_sel > c && input_cur <= c) || (input_sel <= c && input_cur > c))
{ {
V_DrawFill(x, y, charwidth, (10 * con_scalefactor), 107 | V_NOSCALESTART); V_DrawFill(x, y, charwidth, (10 * con_scalefactor), 77 | V_NOSCALESTART);
V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, !cv_allcaps.value); V_DrawCharacter(x, y, p[c] | cv_constextsize.value | V_YELLOWMAP | V_NOSCALESTART, !cv_allcaps.value);
} }
else else
@ -1497,7 +1497,7 @@ static void CON_DrawInput(void)
if (rellip) if (rellip)
{ {
if (input_sel > cend) if (input_sel > cend)
V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 107 | V_NOSCALESTART); V_DrawFill(x, y, charwidth*3, (10 * con_scalefactor), 77 | V_NOSCALESTART);
for (i = 0; i < 3; ++i, x += charwidth) for (i = 0; i < 3; ++i, x += charwidth)
V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value); V_DrawCharacter(x, y, '.' | cv_constextsize.value | V_GRAYMAP | V_NOSCALESTART, !cv_allcaps.value);
} }

6
src/d_clisrv.c
View file

@ -1175,7 +1175,7 @@ static inline void CL_DrawConnectionStatus(void)
if (cl_mode != CL_DOWNLOADFILES) if (cl_mode != CL_DOWNLOADFILES)
{ {
INT32 i, animtime = ((ccstime / 4) & 15) + 16; INT32 i, animtime = ((ccstime / 4) & 15) + 16;
UINT8 palstart = (cl_mode == CL_SEARCHING) ? 128 : 160; UINT8 palstart = (cl_mode == CL_SEARCHING) ? 32 : 96;
// 15 pal entries total. // 15 pal entries total.
const char *cltext; const char *cltext;
@ -1259,8 +1259,8 @@ static inline void CL_DrawConnectionStatus(void)
dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256); dldlength = (INT32)((file->currentsize/(double)file->totalsize) * 256);
if (dldlength > 256) if (dldlength > 256)
dldlength = 256; dldlength = 256;
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 175); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, 256, 8, 111);
V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 160); V_DrawFill(BASEVIDWIDTH/2-128, BASEVIDHEIGHT-24, dldlength, 8, 96);
memset(tempname, 0, sizeof(tempname)); memset(tempname, 0, sizeof(tempname));
// offset filename to just the name only part // offset filename to just the name only part

8
src/f_finale.c
View file

@ -173,7 +173,7 @@ static void F_SkyScroll(INT32 scrollspeed)
// SRB2Kart: F_DrawPatchCol is over-engineered; recoded to be less shitty and error-prone // SRB2Kart: F_DrawPatchCol is over-engineered; recoded to be less shitty and error-prone
if (rendermode != render_none) if (rendermode != render_none)
{ {
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 0);
x = -((INT32)animtimer); x = -((INT32)animtimer);
y = 0; y = 0;
@ -274,7 +274,7 @@ static void F_IntroDrawScene(void)
highres = true; highres = true;
} }
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 0);
if (background) if (background)
{ {
@ -965,7 +965,7 @@ void F_TitleScreenDrawer(void)
} }
else if (finalecount < 52) else if (finalecount < 52)
{ {
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 0);
V_DrawSmallScaledPatch(84, 36, 0, ttkflash); V_DrawSmallScaledPatch(84, 36, 0, ttkflash);
} }
else else
@ -981,7 +981,7 @@ void F_TitleScreenDrawer(void)
V_DrawSciencePatch(280<<FRACBITS, -(40<<FRACBITS) + FixedMul(40<<FRACBITS, FixedDiv(finalecount%70, 70)), V_SNAPTOTOP|V_SNAPTORIGHT, ttcheckers, FRACUNIT); V_DrawSciencePatch(280<<FRACBITS, -(40<<FRACBITS) + FixedMul(40<<FRACBITS, FixedDiv(finalecount%70, 70)), V_SNAPTOTOP|V_SNAPTORIGHT, ttcheckers, FRACUNIT);
if (transval) if (transval)
V_DrawFadeScreen(120, 10 - transval); V_DrawFadeScreen(0, 10 - transval);
V_DrawSmallScaledPatch(84, 36, 0, ttbanner); V_DrawSmallScaledPatch(84, 36, 0, ttbanner);

8
src/g_game.c
View file

@ -3436,12 +3436,12 @@ UINT8 G_GetGametypeColor(INT16 gt)
{ {
if (modeattacking // == ATTACKING_RECORD if (modeattacking // == ATTACKING_RECORD
|| gamestate == GS_TIMEATTACK) || gamestate == GS_TIMEATTACK)
return orangemap[120]; return orangemap[0];
if (gt == GT_MATCH) if (gt == GT_MATCH)
return redmap[120]; return redmap[0];
if (gt == GT_RACE) if (gt == GT_RACE)
return skymap[120]; return skymap[0];
return 247; // FALLBACK return 255; // FALLBACK
} }
// //

4
src/hardware/hw_defs.h
View file

@ -46,8 +46,8 @@ typedef unsigned char FBOOLEAN;
#define HWR_PATCHES_CHROMAKEY_COLORINDEX 0 #define HWR_PATCHES_CHROMAKEY_COLORINDEX 0
#define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 1 #define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 1
#else #else
#define HWR_PATCHES_CHROMAKEY_COLORINDEX 247 #define HWR_PATCHES_CHROMAKEY_COLORINDEX 255
#define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 220 #define HWR_CHROMAKEY_EQUIVALENTCOLORINDEX 130
#endif #endif
// the chroma key color shows on border sprites, set it to black // the chroma key color shows on border sprites, set it to black

10
src/hu_stuff.c
View file

@ -1581,7 +1581,7 @@ static void HU_drawMiniChat(void)
else else
{ {
if (cv_chatbacktint.value) // on request of wolfy if (cv_chatbacktint.value) // on request of wolfy
V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); V_DrawFillConsoleMap(x + dx + 2, y+dy, charwidth, charheight, 159|V_SNAPTOBOTTOM|V_SNAPTOLEFT);
V_DrawChatCharacter(x + dx + 2, y+dy, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap); V_DrawChatCharacter(x + dx + 2, y+dy, msg[j++] |V_SNAPTOBOTTOM|V_SNAPTOLEFT|transflag, !cv_allcaps.value, colormap);
} }
@ -1645,7 +1645,7 @@ static void HU_drawChatLog(INT32 offset)
chat_topy = y + chat_scroll*charheight; chat_topy = y + chat_scroll*charheight;
chat_bottomy = chat_topy + boxh*charheight; chat_bottomy = chat_topy + boxh*charheight;
V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 239|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box V_DrawFillConsoleMap(chatx, chat_topy, boxw, boxh*charheight +2, 159|V_SNAPTOBOTTOM|V_SNAPTOLEFT); // log box
for (i=0; i<chat_nummsg_log; i++) // iterate through our chatlog for (i=0; i<chat_nummsg_log; i++) // iterate through our chatlog
{ {
@ -1770,7 +1770,7 @@ static void HU_DrawChat(void)
cflag = V_GRAYMAP; // set text in gray if chat is muted. cflag = V_GRAYMAP; // set text in gray if chat is muted.
} }
V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); V_DrawFillConsoleMap(chatx, y-1, boxw, (typelines*charheight), 159 | V_SNAPTOBOTTOM | V_SNAPTOLEFT);
while (talk[i]) while (talk[i])
{ {
@ -1897,14 +1897,14 @@ static void HU_DrawChat(void)
{ {
char name[MAXPLAYERNAME+1]; char name[MAXPLAYERNAME+1];
strlcpy(name, player_names[i], 7); // shorten name to 7 characters. strlcpy(name, player_names[i], 7); // shorten name to 7 characters.
V_DrawFillConsoleMap(chatx+ boxw + 2, p_dispy- (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud. V_DrawFillConsoleMap(chatx+ boxw + 2, p_dispy- (6*count), 48, 6, 159 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
V_DrawSmallString(chatx+ boxw + 4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, name)); V_DrawSmallString(chatx+ boxw + 4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, va("\x82%d\x80 - %s", i, name));
count++; count++;
} }
} }
if (count == 0) // no results. if (count == 0) // no results.
{ {
V_DrawFillConsoleMap(chatx+boxw+2, p_dispy- (6*count), 48, 6, 239 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud. V_DrawFillConsoleMap(chatx+boxw+2, p_dispy- (6*count), 48, 6, 159 | V_SNAPTOBOTTOM | V_SNAPTOLEFT); // fill it like the chat so the text doesn't become hard to read because of the hud.
V_DrawSmallString(chatx+boxw+4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT."); V_DrawSmallString(chatx+boxw+4, p_dispy- (6*count), V_SNAPTOBOTTOM|V_SNAPTOLEFT|V_ALLOWLOWERCASE, "NO RESULT.");
} }
} }

6
src/k_kart.c
View file

@ -37,7 +37,7 @@
//{ SRB2kart Color Code //{ SRB2kart Color Code
#define SKIN_RAMP_LENGTH 16 #define SKIN_RAMP_LENGTH 16
#define DEFAULT_STARTTRANSCOLOR 160 #define DEFAULT_STARTTRANSCOLOR 96
#define NUM_PALETTE_ENTRIES 256 #define NUM_PALETTE_ENTRIES 256
// These should be within 14 characters to fit on the character select screen // These should be within 14 characters to fit on the character select screen
@ -492,7 +492,7 @@ void K_GenerateKartColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color)
if (skinnum == TC_BOSS) if (skinnum == TC_BOSS)
dest_colormap[31] = 0; dest_colormap[31] = 0;
else if (skinnum == TC_METALSONIC) else if (skinnum == TC_METALSONIC)
dest_colormap[239] = 0; dest_colormap[143] = 0;
return; return;
} }
@ -7060,7 +7060,7 @@ static void K_drawKartItem(void)
V_DrawFill(fx+x+length, fy+y+1, 1, height, 12|fflags); // the right one V_DrawFill(fx+x+length, fy+y+1, 1, height, 12|fflags); // the right one
if (height == 2) if (height == 2)
V_DrawFill(fx+x+2, fy+y+2, length-2, 1, 8|fflags); // the dulled underside V_DrawFill(fx+x+2, fy+y+2, length-2, 1, 8|fflags); // the dulled underside
V_DrawFill(fx+x+2, fy+y+1, length-2, 1, 120|fflags); // the shine V_DrawFill(fx+x+2, fy+y+1, length-2, 1, 0|fflags); // the shine
} }
} }

26
src/m_menu.c
View file

@ -3512,7 +3512,7 @@ static void M_DrawSlider(INT32 x, INT32 y, const consvar_t *cv, boolean ontop)
void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines) void M_DrawTextBox(INT32 x, INT32 y, INT32 width, INT32 boxlines)
{ {
// Solid color textbox. // Solid color textbox.
V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 239); V_DrawFill(x+5, y+5, width*8+6, boxlines*8+6, 159);
//V_DrawFill(x+8, y+8, width*8, boxlines*8, 31); //V_DrawFill(x+8, y+8, width*8, boxlines*8, 31);
/* /*
patch_t *p; patch_t *p;
@ -4671,10 +4671,10 @@ static void M_DrawTemperature(INT32 x, fixed_t t)
t = (FixedMul(h<<FRACBITS, t)>>FRACBITS); t = (FixedMul(h<<FRACBITS, t)>>FRACBITS);
// border // border
V_DrawFill(x - 1, vpadding, 1, h, 120); V_DrawFill(x - 1, vpadding, 1, h, 0);
V_DrawFill(x + width, vpadding, 1, h, 120); V_DrawFill(x + width, vpadding, 1, h, 0);
V_DrawFill(x - 1, vpadding-1, width+2, 1, 120); V_DrawFill(x - 1, vpadding-1, width+2, 1, 0);
V_DrawFill(x - 1, vpadding+h, width+2, 1, 120); V_DrawFill(x - 1, vpadding+h, width+2, 1, 0);
// bar itself // bar itself
y = h; y = h;
@ -4832,7 +4832,7 @@ static void M_DrawAddons(void)
V_DrawFill(x-21, (y - 16) + (lsheadingheight - 2), MAXSTRINGLENGTH*8+6, 1, 30); V_DrawFill(x-21, (y - 16) + (lsheadingheight - 2), MAXSTRINGLENGTH*8+6, 1, 30);
m = (BASEVIDHEIGHT - currentMenu->y + 2) - (y - 1); m = (BASEVIDHEIGHT - currentMenu->y + 2) - (y - 1);
V_DrawFill(x - 21, y - 1, MAXSTRINGLENGTH*8+6, m, 239); V_DrawFill(x - 21, y - 1, MAXSTRINGLENGTH*8+6, m, 159);
// scrollbar! // scrollbar!
if (sizedirmenu <= (2*numaddonsshown + 1)) if (sizedirmenu <= (2*numaddonsshown + 1))
@ -5558,8 +5558,8 @@ static void M_DrawReplayHut(void)
y = sizedirmenu*10 + currentMenu->menuitems[replaylistitem].alphaKey + 30; y = sizedirmenu*10 + currentMenu->menuitems[replaylistitem].alphaKey + 30;
if (y > SCALEDVIEWHEIGHT-80) if (y > SCALEDVIEWHEIGHT-80)
{ {
V_DrawFill(BASEVIDWIDTH-4, 75, 4, SCALEDVIEWHEIGHT-80, V_SNAPTOTOP|V_SNAPTORIGHT|239); V_DrawFill(BASEVIDWIDTH-4, 75, 4, SCALEDVIEWHEIGHT-80, V_SNAPTOTOP|V_SNAPTORIGHT|159);
V_DrawFill(BASEVIDWIDTH-3, 76 + (SCALEDVIEWHEIGHT-80) * replayhutmenuy / y, 2, (((SCALEDVIEWHEIGHT-80) * (SCALEDVIEWHEIGHT-80))-1) / y - 1, V_SNAPTOTOP|V_SNAPTORIGHT|229); V_DrawFill(BASEVIDWIDTH-3, 76 + (SCALEDVIEWHEIGHT-80) * replayhutmenuy / y, 2, (((SCALEDVIEWHEIGHT-80) * (SCALEDVIEWHEIGHT-80))-1) / y - 1, V_SNAPTOTOP|V_SNAPTORIGHT|149);
} }
// Draw the cursor // Draw the cursor
@ -5568,7 +5568,7 @@ static void M_DrawReplayHut(void)
V_DrawString(currentMenu->x, cursory, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[itemOn].text); V_DrawString(currentMenu->x, cursory, V_SNAPTOTOP|V_SNAPTOLEFT|highlightflags, currentMenu->menuitems[itemOn].text);
// Now draw some replay info! // Now draw some replay info!
V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|239); V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|159);
if (itemOn == replaylistitem) if (itemOn == replaylistitem)
{ {
@ -5650,7 +5650,7 @@ static void M_DrawReplayStartMenu(void)
} }
} }
V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|239); V_DrawFill(10, 10, 300, 60, V_SNAPTOTOP|159);
DrawReplayHutReplayInfo(); DrawReplayHutReplayInfo();
V_DrawString(10, 72, V_SNAPTOTOP|highlightflags|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].title); V_DrawString(10, 72, V_SNAPTOTOP|highlightflags|V_ALLOWLOWERCASE, demolist[dir_on[menudepthleft]].title);
@ -7579,7 +7579,7 @@ void M_DrawTimeAttackMenu(void)
time = mainrecords[cv_nextmap.value-1]->time; time = mainrecords[cv_nextmap.value-1]->time;
} }
V_DrawFill((BASEVIDWIDTH - dupadjust)>>1, 78, dupadjust, 36, 239); V_DrawFill((BASEVIDWIDTH - dupadjust)>>1, 78, dupadjust, 36, 159);
V_DrawRightAlignedString(149, 80, highlightflags, "BEST LAP:"); V_DrawRightAlignedString(149, 80, highlightflags, "BEST LAP:");
K_drawKartTimestamp(lap, 19, 86, 0, 2); K_drawKartTimestamp(lap, 19, 86, 0, 2);
@ -8818,7 +8818,7 @@ Update the maxplayers label...
#ifndef NONET #ifndef NONET
y += MP_MainMenu[8].alphaKey; y += MP_MainMenu[8].alphaKey;
V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 239); V_DrawFill(x+5, y+4+5, /*16*8 + 6,*/ BASEVIDWIDTH - 2*(x+5), 8+6, 159);
// draw name string // draw name string
V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip); V_DrawString(x+8,y+12, V_ALLOWLOWERCASE, setupm_ip);
@ -9292,7 +9292,7 @@ static void M_DrawSetupMultiPlayerMenu(void)
flags |= V_FLIP; // This sprite is left/right flipped! flags |= V_FLIP; // This sprite is left/right flipped!
// draw box around guy // draw box around guy
V_DrawFill(mx + 43 - (charw/2), my+65, charw, 84, 239); V_DrawFill(mx + 43 - (charw/2), my+65, charw, 84, 159);
// draw player sprite // draw player sprite
if (setupm_fakecolor) // inverse should never happen if (setupm_fakecolor) // inverse should never happen

4
src/p_setup.c
View file

@ -2858,13 +2858,13 @@ boolean P_SetupLevel(boolean skipprecip)
S_StartSound(NULL, sfx_ruby1); S_StartSound(NULL, sfx_ruby1);
F_WipeStartScreen(); F_WipeStartScreen();
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 122); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 209);
F_WipeEndScreen(); F_WipeEndScreen();
F_RunWipe(wipedefs[wipe_speclevel_towhite], false); F_RunWipe(wipedefs[wipe_speclevel_towhite], false);
F_WipeStartScreen(); F_WipeStartScreen();
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 120); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 0);
F_WipeEndScreen(); F_WipeEndScreen();
F_RunWipe(wipedefs[wipe_level_final], false); F_RunWipe(wipedefs[wipe_level_final], false);

4
src/r_draw.c
View file

@ -139,7 +139,7 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
#define BLINK_TT_CACHE_INDEX (MAXSKINS + 5) #define BLINK_TT_CACHE_INDEX (MAXSKINS + 5)
#define TT_CACHE_SIZE (MAXSKINS + 6) #define TT_CACHE_SIZE (MAXSKINS + 6)
#define SKIN_RAMP_LENGTH 16 #define SKIN_RAMP_LENGTH 16
#define DEFAULT_STARTTRANSCOLOR 160 #define DEFAULT_STARTTRANSCOLOR 96
#define NUM_PALETTE_ENTRIES 256 #define NUM_PALETTE_ENTRIES 256
static UINT8** translationtablecache[TT_CACHE_SIZE] = {NULL}; static UINT8** translationtablecache[TT_CACHE_SIZE] = {NULL};
@ -295,7 +295,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
if (skinnum == TC_BOSS) if (skinnum == TC_BOSS)
dest_colormap[31] = 0; dest_colormap[31] = 0;
else if (skinnum == TC_METALSONIC) else if (skinnum == TC_METALSONIC)
dest_colormap[239] = 0; dest_colormap[159] = 0;
return; return;
} }

2
src/r_draw8.c
View file

@ -105,7 +105,7 @@ void R_DrawColumn_8(void)
} }
} }
#define TRANSPARENTPIXEL 247 #define TRANSPARENTPIXEL 255
void R_Draw2sMultiPatchColumn_8(void) void R_Draw2sMultiPatchColumn_8(void)
{ {

2
src/r_main.c
View file

@ -1331,7 +1331,7 @@ void R_RenderPlayerView(player_t *player)
if (cv_homremoval.value == 1) if (cv_homremoval.value == 1)
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // No HOM effect! V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31); // No HOM effect!
else //'development' HOM removal -- makes it blindingly obvious if HOM is spotted. else //'development' HOM removal -- makes it blindingly obvious if HOM is spotted.
V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 128+(timeinmap&15)); V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 32+(timeinmap&15));
} }
// Draw over the fourth screen so you don't have to stare at a HOM :V // Draw over the fourth screen so you don't have to stare at a HOM :V
else if (splitscreen == 2 && player == &players[displayplayers[2]]) else if (splitscreen == 2 && player == &players[displayplayers[2]])

2
src/r_things.c
View file

@ -2531,7 +2531,7 @@ static void Sk_SetDefaultValue(skin_t *skin)
strncpy(skin->facewant, "PLAYWANT", 9); strncpy(skin->facewant, "PLAYWANT", 9);
strncpy(skin->facemmap, "PLAYMMAP", 9); strncpy(skin->facemmap, "PLAYMMAP", 9);
skin->starttranscolor = 160; skin->starttranscolor = 96;
skin->prefcolor = SKINCOLOR_GREEN; skin->prefcolor = SKINCOLOR_GREEN;
// SRB2kart // SRB2kart

4
src/st_stuff.c
View file

@ -2138,8 +2138,8 @@ void ST_Drawer(void)
if (timeinmap < 15) if (timeinmap < 15)
{ {
if (timeinmap <= 5) if (timeinmap <= 5)
V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,120); // Pure white on first few frames, to hide SRB2's awful level load artifacts V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,0); // Pure white on first few frames, to hide SRB2's awful level load artifacts
else else
V_DrawFadeScreen(120, 15-timeinmap); // Then gradually fade out from there V_DrawFadeScreen(0, 15-timeinmap); // Then gradually fade out from there
} }
} }

2
src/tmap.nas
View file

@ -17,7 +17,7 @@
[BITS 32] [BITS 32]
%define FRACBITS 16 %define FRACBITS 16
%define TRANSPARENTPIXEL 247 %define TRANSPARENTPIXEL 255
%ifdef LINUX %ifdef LINUX
%macro cextern 1 %macro cextern 1

2
src/tmap_mmx.nas
View file

@ -18,7 +18,7 @@
[BITS 32] [BITS 32]
%define FRACBITS 16 %define FRACBITS 16
%define TRANSPARENTPIXEL 247 %define TRANSPARENTPIXEL 255
%ifdef LINUX %ifdef LINUX
%macro cextern 1 %macro cextern 1

4
src/y_inter.c
View file

@ -1083,7 +1083,7 @@ void Y_VoteDrawer(void)
V_DrawMappedPatch(BASEVIDWIDTH-124, handy, V_SNAPTORIGHT, thiscurs, colormap); V_DrawMappedPatch(BASEVIDWIDTH-124, handy, V_SNAPTORIGHT, thiscurs, colormap);
if (votetic % 10 < 4) if (votetic % 10 < 4)
V_DrawFill(BASEVIDWIDTH-100-sizeadd, y-sizeadd, 80+(sizeadd*2), 50+(sizeadd*2), 120|V_SNAPTORIGHT); V_DrawFill(BASEVIDWIDTH-100-sizeadd, y-sizeadd, 80+(sizeadd*2), 50+(sizeadd*2), 0|V_SNAPTORIGHT);
else else
V_DrawFill(BASEVIDWIDTH-100-sizeadd, y-sizeadd, 80+(sizeadd*2), 50+(sizeadd*2), color|V_SNAPTORIGHT); V_DrawFill(BASEVIDWIDTH-100-sizeadd, y-sizeadd, 80+(sizeadd*2), 50+(sizeadd*2), color|V_SNAPTORIGHT);
@ -1154,7 +1154,7 @@ void Y_VoteDrawer(void)
{ {
V_DrawScaledPatch(x-18, y+9, V_SNAPTOLEFT, cursor); V_DrawScaledPatch(x-18, y+9, V_SNAPTOLEFT, cursor);
if (voteendtic != -1 && !(votetic % 4)) if (voteendtic != -1 && !(votetic % 4))
V_DrawFill(x-1, y-1, 42, 27, 120|V_SNAPTOLEFT); V_DrawFill(x-1, y-1, 42, 27, 0|V_SNAPTOLEFT);
else else
V_DrawFill(x-1, y-1, 42, 27, levelinfo[votes[i]].gtc|V_SNAPTOLEFT); V_DrawFill(x-1, y-1, 42, 27, levelinfo[votes[i]].gtc|V_SNAPTOLEFT);
} }