diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index ed0b8e528ef1462ada824a9f7764168b18a96b1e..25b156153fda79bcad66427359c11cc157aec016 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1495,7 +1495,7 @@ static boolean SV_SendServerConfig(INT32 node)
if (!playeringame[i])
continue;
netbuffer->u.servercfg.playerskins[i] = (UINT8)players[i].skin;
- netbuffer->u.servercfg.playercolor[i] = (UINT8)players[i].skincolor;
+ netbuffer->u.servercfg.playercolor[i] = (UINT16)players[i].skincolor;
netbuffer->u.servercfg.playeravailabilities[i] = (UINT32)LONG(players[i].availabilities);
}
@@ -3877,7 +3877,7 @@ static void HandlePacketFromAwayNode(SINT8 node)
for (j = 0; j < MAXPLAYERS; j++)
{
if (netbuffer->u.servercfg.playerskins[j] == 0xFF
- && netbuffer->u.servercfg.playercolor[j] == 0xFF
+ && netbuffer->u.servercfg.playercolor[j] == 0xFFFF
&& netbuffer->u.servercfg.playeravailabilities[j] == 0xFFFFFFFF)
continue; // not in game
diff --git a/src/d_clisrv.h b/src/d_clisrv.h
index 463240a2adc87289f8e00f319c7f90df062bf5f2..f15b5ff91efb5473794194bda8b621e7db689ce4 100644
--- a/src/d_clisrv.h
+++ b/src/d_clisrv.h
@@ -188,7 +188,7 @@ typedef struct
SINT8 xtralife;
SINT8 pity;
- UINT8 skincolor;
+ UINT16 skincolor;
INT32 skin;
UINT32 availabilities;
// Just in case Lua does something like
@@ -308,7 +308,7 @@ typedef struct
// 0xFF == not in game; else player skin num
UINT8 playerskins[MAXPLAYERS];
- UINT8 playercolor[MAXPLAYERS];
+ UINT16 playercolor[MAXPLAYERS];
UINT32 playeravailabilities[MAXPLAYERS];
UINT8 gametype;
@@ -414,7 +414,7 @@ typedef struct
{
char name[MAXPLAYERNAME+1];
UINT8 skin;
- UINT8 color;
+ UINT16 color;
UINT32 pflags;
UINT32 score;
UINT8 ctfteam;
diff --git a/src/d_main.c b/src/d_main.c
index 07a7ecf91038f802742077a283c3c1691d545529..96760c7942b1f90c89e850a4c16ca7f25dfd4b4f 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1190,6 +1190,10 @@ void D_SRB2Main(void)
if (M_CheckParm("-password") && M_IsNextParm())
D_SetPassword(M_GetNextParm());
+
+ // player setup menu colors must be initialized before
+ // any wad file is added, as they may contain colors themselves
+ M_InitPlayerSetupColors();
CONS_Printf("Z_Init(): Init zone memory allocation daemon. \n");
Z_Init();
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index dfc7351f5808ba8feff8ba0525d72774d4550993..84070135a165d1e54a7b884135275ba08a29957b 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -225,6 +225,7 @@ consvar_t cv_allowseenames = {"allowseenames", "Yes", CV_NETVAR, CV_YesNo, NULL,
consvar_t cv_playername = {"name", "Sonic", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_playername2 = {"name2", "Tails", CV_SAVE|CV_CALL|CV_NOINIT, NULL, Name2_OnChange, 0, NULL, NULL, 0, 0, NULL};
// player colors
+UINT16 lastgoodcolor = SKINCOLOR_BLUE, lastgoodcolor2 = SKINCOLOR_BLUE;
consvar_t cv_playercolor = {"color", "Blue", CV_CALL|CV_NOINIT, Color_cons_t, Color_OnChange, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_playercolor2 = {"color2", "Orange", CV_CALL|CV_NOINIT, Color_cons_t, Color2_OnChange, 0, NULL, NULL, 0, 0, NULL};
// player's skin, saved for commodity, when using a favorite skins wad..
@@ -619,7 +620,7 @@ void D_RegisterClientCommands(void)
for (i = 0; i < MAXSKINCOLORS; i++)
{
Color_cons_t[i].value = i;
- Color_cons_t[i].strvalue = Color_Names[i];
+ Color_cons_t[i].strvalue = skincolors[i].name;
}
Color_cons_t[MAXSKINCOLORS].value = 0;
Color_cons_t[MAXSKINCOLORS].strvalue = NULL;
@@ -1221,15 +1222,20 @@ static void SendNameAndColor(void)
CV_StealthSetValue(&cv_playercolor, skincolor_blueteam);
}
- // never allow the color "none"
- if (!cv_playercolor.value)
+ // don't allow inaccessible colors
+ if (!skincolors[cv_playercolor.value].accessible)
{
- if (players[consoleplayer].skincolor)
+ if (players[consoleplayer].skincolor && skincolors[players[consoleplayer].skincolor].accessible)
CV_StealthSetValue(&cv_playercolor, players[consoleplayer].skincolor);
- else if (skins[players[consoleplayer].skin].prefcolor)
- CV_StealthSetValue(&cv_playercolor, skins[players[consoleplayer].skin].prefcolor);
- else
+ else if (skincolors[atoi(cv_playercolor.defaultvalue)].accessible)
CV_StealthSet(&cv_playercolor, cv_playercolor.defaultvalue);
+ else if (skins[players[consoleplayer].skin].prefcolor && skincolors[skins[players[consoleplayer].skin].prefcolor].accessible)
+ CV_StealthSetValue(&cv_playercolor, skins[players[consoleplayer].skin].prefcolor);
+ else {
+ UINT16 i = 0;
+ while (i<numskincolors && !skincolors[i].accessible) i++;
+ CV_StealthSetValue(&cv_playercolor, (i != numskincolors) ? i : SKINCOLOR_BLUE);
+ }
}
if (!strcmp(cv_playername.string, player_names[consoleplayer])
@@ -1276,10 +1282,10 @@ static void SendNameAndColor(void)
{
CV_StealthSetValue(&cv_playercolor, skins[cv_skin.value].prefcolor);
- players[consoleplayer].skincolor = cv_playercolor.value % MAXSKINCOLORS;
+ players[consoleplayer].skincolor = cv_playercolor.value % numskincolors;
if (players[consoleplayer].mo)
- players[consoleplayer].mo->color = (UINT8)players[consoleplayer].skincolor;
+ players[consoleplayer].mo->color = (UINT16)players[consoleplayer].skincolor;
}*/
}
else
@@ -1317,7 +1323,7 @@ static void SendNameAndColor(void)
// Finally write out the complete packet and send it off.
WRITESTRINGN(p, cv_playername.zstring, MAXPLAYERNAME);
WRITEUINT32(p, (UINT32)players[consoleplayer].availabilities);
- WRITEUINT8(p, (UINT8)cv_playercolor.value);
+ WRITEUINT16(p, (UINT16)cv_playercolor.value);
WRITEUINT8(p, (UINT8)cv_skin.value);
SendNetXCmd(XD_NAMEANDCOLOR, buf, p - buf);
}
@@ -1344,15 +1350,20 @@ static void SendNameAndColor2(void)
CV_StealthSetValue(&cv_playercolor2, skincolor_blueteam);
}
- // never allow the color "none"
- if (!cv_playercolor2.value)
+ // don't allow inaccessible colors
+ if (!skincolors[cv_playercolor2.value].accessible)
{
- if (players[secondplaya].skincolor)
+ if (players[secondplaya].skincolor && skincolors[players[secondplaya].skincolor].accessible)
CV_StealthSetValue(&cv_playercolor2, players[secondplaya].skincolor);
- else if (skins[players[secondplaya].skin].prefcolor)
+ else if (skincolors[atoi(cv_playercolor2.defaultvalue)].accessible)
+ CV_StealthSet(&cv_playercolor, cv_playercolor2.defaultvalue);
+ else if (skins[players[secondplaya].skin].prefcolor && skincolors[skins[players[secondplaya].skin].prefcolor].accessible)
CV_StealthSetValue(&cv_playercolor2, skins[players[secondplaya].skin].prefcolor);
- else
- CV_StealthSet(&cv_playercolor2, cv_playercolor2.defaultvalue);
+ else {
+ UINT16 i = 0;
+ while (i<numskincolors && !skincolors[i].accessible) i++;
+ CV_StealthSetValue(&cv_playercolor2, (i != numskincolors) ? i : SKINCOLOR_BLUE);
+ }
}
players[secondplaya].availabilities = R_GetSkinAvailabilities();
@@ -1405,7 +1416,7 @@ static void SendNameAndColor2(void)
{
CV_StealthSetValue(&cv_playercolor2, skins[players[secondplaya].skin].prefcolor);
- players[secondplaya].skincolor = cv_playercolor2.value % MAXSKINCOLORS;
+ players[secondplaya].skincolor = cv_playercolor2.value % numskincolors;
if (players[secondplaya].mo)
players[secondplaya].mo->color = players[secondplaya].skincolor;
@@ -1428,7 +1439,8 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
{
player_t *p = &players[playernum];
char name[MAXPLAYERNAME+1];
- UINT8 color, skin;
+ UINT16 color;
+ UINT8 skin;
#ifdef PARANOIA
if (playernum < 0 || playernum > MAXPLAYERS)
@@ -1447,7 +1459,7 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
READSTRINGN(*cp, name, MAXPLAYERNAME);
p->availabilities = READUINT32(*cp);
- color = READUINT8(*cp);
+ color = READUINT16(*cp);
skin = READUINT8(*cp);
// set name
@@ -1455,9 +1467,9 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
SetPlayerName(playernum, name);
// set color
- p->skincolor = color % MAXSKINCOLORS;
+ p->skincolor = color % numskincolors;
if (p->mo)
- p->mo->color = (UINT8)p->skincolor;
+ p->mo->color = (UINT16)p->skincolor;
// normal player colors
if (server && (p != &players[consoleplayer] && p != &players[secondarydisplayplayer]))
@@ -1474,8 +1486,8 @@ static void Got_NameAndColor(UINT8 **cp, INT32 playernum)
kick = true;
}
- // don't allow color "none"
- if (!p->skincolor)
+ // don't allow inaccessible colors
+ if (skincolors[p->skincolor].accessible == false)
kick = true;
// availabilities
@@ -4473,25 +4485,30 @@ static void Skin2_OnChange(void)
*/
static void Color_OnChange(void)
{
- if (!Playing())
- return; // do whatever you want
-
- if (!(cv_debug || devparm) && !(multiplayer || netgame)) // In single player.
- {
- CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
- return;
- }
-
- if (!P_PlayerMoving(consoleplayer))
- {
- // Color change menu scrolling fix is no longer necessary
- SendNameAndColor();
+ if (!Playing()) {
+ if (!cv_playercolor.value || !skincolors[cv_playercolor.value].accessible)
+ CV_StealthSetValue(&cv_playercolor, lastgoodcolor);
}
else
{
- CV_StealthSetValue(&cv_playercolor,
- players[consoleplayer].skincolor);
+ if (!(cv_debug || devparm) && !(multiplayer || netgame)) // In single player.
+ {
+ CV_StealthSet(&cv_skin, skins[players[consoleplayer].skin].name);
+ return;
+ }
+
+ if (!P_PlayerMoving(consoleplayer) && skincolors[players[consoleplayer].skincolor].accessible == true)
+ {
+ // Color change menu scrolling fix is no longer necessary
+ SendNameAndColor();
+ }
+ else
+ {
+ CV_StealthSetValue(&cv_playercolor,
+ players[consoleplayer].skincolor);
+ }
}
+ lastgoodcolor = cv_playercolor.value;
}
/** Sends a color change for the secondary splitscreen player, unless that
@@ -4502,18 +4519,24 @@ static void Color_OnChange(void)
static void Color2_OnChange(void)
{
if (!Playing() || !splitscreen)
- return; // do whatever you want
-
- if (!P_PlayerMoving(secondarydisplayplayer))
{
- // Color change menu scrolling fix is no longer necessary
- SendNameAndColor2();
+ if (!cv_playercolor2.value || !skincolors[cv_playercolor2.value].accessible)
+ CV_StealthSetValue(&cv_playercolor2, lastgoodcolor2);
}
else
{
- CV_StealthSetValue(&cv_playercolor2,
- players[secondarydisplayplayer].skincolor);
+ if (!P_PlayerMoving(secondarydisplayplayer) && skincolors[players[secondarydisplayplayer].skincolor].accessible == true)
+ {
+ // Color change menu scrolling fix is no longer necessary
+ SendNameAndColor2();
+ }
+ else
+ {
+ CV_StealthSetValue(&cv_playercolor2,
+ players[secondarydisplayplayer].skincolor);
+ }
}
+ lastgoodcolor2 = cv_playercolor2.value;
}
/** Displays the result of the chat being muted or unmuted.
diff --git a/src/d_player.h b/src/d_player.h
index e5c7e72980d644dc926ca8e792f1136a54fd3b16..0f10317084b046d713a5b96a3a2e9392af6fb892 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -366,7 +366,7 @@ typedef struct player_s
UINT16 flashpal;
// Player skin colorshift, 0-15 for which color to draw player.
- UINT8 skincolor;
+ UINT16 skincolor;
INT32 skin;
UINT32 availabilities;
diff --git a/src/dehacked.c b/src/dehacked.c
index d78a0d6c65f3a55a14240bac697ae240b10debaf..627a3a11921ad43b945f0ea1519fec4d20750dff 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -56,10 +56,12 @@ int vsnprintf(char *str, size_t n, const char *fmt, va_list ap);
// The crazy word-reading stuff uses these.
static char *FREE_STATES[NUMSTATEFREESLOTS];
static char *FREE_MOBJS[NUMMOBJFREESLOTS];
+static char *FREE_SKINCOLORS[NUMCOLORFREESLOTS];
static UINT8 used_spr[(NUMSPRITEFREESLOTS / 8) + 1]; // Bitwise flag for sprite freeslot in use! I would use ceil() here if I could, but it only saves 1 byte of memory anyway.
#define initfreeslots() {\
memset(FREE_STATES,0,sizeof(char *) * NUMSTATEFREESLOTS);\
memset(FREE_MOBJS,0,sizeof(char *) * NUMMOBJFREESLOTS);\
+memset(FREE_SKINCOLORS,0,sizeof(char *) * NUMCOLORFREESLOTS);\
memset(used_spr,0,sizeof(UINT8) * ((NUMSPRITEFREESLOTS / 8) + 1));\
}
@@ -77,6 +79,7 @@ static hudnum_t get_huditem(const char *word);
static menutype_t get_menutype(const char *word);
//static INT16 get_gametype(const char *word);
//static powertype_t get_power(const char *word);
+skincolornum_t get_skincolor(const char *word);
boolean deh_loaded = false;
static int dbg_line;
@@ -449,7 +452,7 @@ static void readPlayer(MYFILE *f, INT32 num)
else if (fastcmp(word, "OPPOSITECOLOR") || fastcmp(word, "OPPOSITECOLOUR"))
{
SLOTFOUND
- description[num].oppositecolor = (UINT8)get_number(word2);
+ description[num].oppositecolor = (UINT16)get_number(word2);
}
else if (fastcmp(word, "NAMETAG") || fastcmp(word, "TAGNAME"))
{
@@ -459,12 +462,12 @@ static void readPlayer(MYFILE *f, INT32 num)
else if (fastcmp(word, "TAGTEXTCOLOR") || fastcmp(word, "TAGTEXTCOLOUR"))
{
SLOTFOUND
- description[num].tagtextcolor = (UINT8)get_number(word2);
+ description[num].tagtextcolor = (UINT16)get_number(word2);
}
else if (fastcmp(word, "TAGOUTLINECOLOR") || fastcmp(word, "TAGOUTLINECOLOUR"))
{
SLOTFOUND
- description[num].tagoutlinecolor = (UINT8)get_number(word2);
+ description[num].tagoutlinecolor = (UINT16)get_number(word2);
}
else if (fastcmp(word, "STATUS"))
{
@@ -571,6 +574,16 @@ static void readfreeslots(MYFILE *f)
break;
}
}
+ else if (fastcmp(type, "SKINCOLOR"))
+ {
+ for (i = 0; i < NUMCOLORFREESLOTS; i++)
+ if (!FREE_SKINCOLORS[i]) {
+ FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_SKINCOLORS[i],word);
+ M_AddMenuColor(numskincolors++);
+ break;
+ }
+ }
else if (fastcmp(type, "SPR2"))
{
// Search if we already have an SPR2 by that name...
@@ -753,6 +766,84 @@ static void readthing(MYFILE *f, INT32 num)
Z_Free(s);
}
+static void readskincolor(MYFILE *f, INT32 num)
+{
+ char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
+ char *word, *word2, *word3;
+ char *tmp;
+
+ Color_cons_t[num].value = num;
+
+ do
+ {
+ if (myfgets(s, MAXLINELEN, f))
+ {
+ if (s[0] == '\n')
+ break;
+
+ tmp = strchr(s, '#');
+ if (tmp)
+ *tmp = '\0';
+ if (s == tmp)
+ continue; // Skip comment lines, but don't break.
+
+ word = strtok(s, " ");
+ if (word)
+ strupr(word);
+ else
+ break;
+
+ word2 = strtok(NULL, " = ");
+ if (word2) {
+ word3 = Z_StrDup(word2);
+ strupr(word2);
+ } else
+ break;
+ if (word2[strlen(word2)-1] == '\n')
+ word2[strlen(word2)-1] = '\0';
+ if (word3[strlen(word3)-1] == '\n')
+ word3[strlen(word3)-1] = '\0';
+
+ if (fastcmp(word, "NAME"))
+ {
+ deh_strlcpy(skincolors[num].name, word3,
+ sizeof (skincolors[num].name), va("Skincolor %d: name", num));
+ }
+ else if (fastcmp(word, "RAMP"))
+ {
+ UINT8 i;
+ tmp = strtok(word2,",");
+ for (i = 0; i < COLORRAMPSIZE; i++) {
+ skincolors[num].ramp[i] = (UINT8)get_number(tmp);
+ if ((tmp = strtok(NULL,",")) == NULL)
+ break;
+ }
+ }
+ else if (fastcmp(word, "INVCOLOR"))
+ {
+ skincolors[num].invcolor = (UINT16)get_number(word2);
+ }
+ else if (fastcmp(word, "INVSHADE"))
+ {
+ skincolors[num].invshade = get_number(word2)%COLORRAMPSIZE;
+ }
+ else if (fastcmp(word, "CHATCOLOR"))
+ {
+ skincolors[num].chatcolor = get_number(word2);
+ }
+ else if (fastcmp(word, "ACCESSIBLE"))
+ {
+ if (num > FIRSTSUPERCOLOR)
+ skincolors[num].accessible = (boolean)(atoi(word2) || word2[0] == 'T' || word2[0] == 'Y');
+ }
+ else
+ deh_warning("Skincolor %d: unknown word '%s'", num, word);
+ }
+ } while (!myfeof(f)); // finish when the line is empty
+
+ Z_Free(s);
+}
+
#ifdef HWRENDER
static void readlight(MYFILE *f, INT32 num)
{
@@ -3952,19 +4043,19 @@ static void readmaincfg(MYFILE *f)
}
else if (fastcmp(word, "REDTEAM"))
{
- skincolor_redteam = (UINT8)get_number(word2);
+ skincolor_redteam = (UINT16)get_number(word2);
}
else if (fastcmp(word, "BLUETEAM"))
{
- skincolor_blueteam = (UINT8)get_number(word2);
+ skincolor_blueteam = (UINT16)get_number(word2);
}
else if (fastcmp(word, "REDRING"))
{
- skincolor_redring = (UINT8)get_number(word2);
+ skincolor_redring = (UINT16)get_number(word2);
}
else if (fastcmp(word, "BLUERING"))
{
- skincolor_bluering = (UINT8)get_number(word2);
+ skincolor_bluering = (UINT16)get_number(word2);
}
else if (fastcmp(word, "INVULNTICS"))
{
@@ -4556,6 +4647,18 @@ static void DEH_LoadDehackedFile(MYFILE *f, boolean mainfile)
ignorelines(f);
}
}
+ else if (fastcmp(word, "SKINCOLOR") || fastcmp(word, "COLOR"))
+ {
+ if (i == 0 && word2[0] != '0') // If word2 isn't a number
+ i = get_skincolor(word2); // find a skincolor by name
+ if (i < numskincolors && i >= (INT32)SKINCOLOR_FIRSTFREESLOT)
+ readskincolor(f, i);
+ else
+ {
+ deh_warning("Skincolor %d out of range (%d - %d)", i, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+ ignorelines(f);
+ }
+ }
else if (fastcmp(word, "SPRITE2"))
{
if (i == 0 && word2[0] != '0') // If word2 isn't a number
@@ -9000,8 +9103,6 @@ static const char *const ML_LIST[16] = {
"TFERLINE"
};
-// This DOES differ from r_draw's Color_Names, unfortunately.
-// Also includes Super colors
static const char *COLOR_ENUMS[] = {
"NONE", // SKINCOLOR_NONE,
@@ -9437,7 +9538,8 @@ struct {
// SKINCOLOR_ doesn't include these..!
{"MAXSKINCOLORS",MAXSKINCOLORS},
- {"MAXTRANSLATIONS",MAXTRANSLATIONS},
+ {"FIRSTSUPERCOLOR",FIRSTSUPERCOLOR},
+ {"NUMSUPERCOLORS",NUMSUPERCOLORS},
// Precipitation
{"PRECIP_NONE",PRECIP_NONE},
@@ -9939,6 +10041,26 @@ static statenum_t get_state(const char *word)
return S_NULL;
}
+skincolornum_t get_skincolor(const char *word)
+{ // Returns the value of SKINCOLOR_ enumerations
+ skincolornum_t i;
+ if (*word >= '0' && *word <= '9')
+ return atoi(word);
+ if (fastncmp("SKINCOLOR_",word,10))
+ word += 10; // take off the SKINCOLOR_
+ for (i = 0; i < NUMCOLORFREESLOTS; i++) {
+ if (!FREE_SKINCOLORS[i])
+ break;
+ if (fastcmp(word, FREE_SKINCOLORS[i]))
+ return SKINCOLOR_FIRSTFREESLOT+i;
+ }
+ for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
+ if (fastcmp(word, COLOR_ENUMS[i]))
+ return i;
+ deh_warning("Couldn't find skincolor named 'SKINCOLOR_%s'",word);
+ return SKINCOLOR_GREEN;
+}
+
static spritenum_t get_sprite(const char *word)
{ // Returns the value of SPR_ enumerations
spritenum_t i;
@@ -10233,6 +10355,11 @@ static fixed_t find_const(const char **rword)
free(word);
return r;
}
+ else if (fastncmp("SKINCOLOR_",word,10)) {
+ r = get_skincolor(word);
+ free(word);
+ return r;
+ }
else if (fastncmp("MT_",word,3)) {
r = get_mobjtype(word);
free(word);
@@ -10301,17 +10428,6 @@ static fixed_t find_const(const char **rword)
free(word);
return r;
}
- else if (fastncmp("SKINCOLOR_",word,10)) {
- char *p = word+10;
- for (i = 0; i < MAXTRANSLATIONS; i++)
- if (fastcmp(p, COLOR_ENUMS[i])) {
- free(word);
- return i;
- }
- const_warning("color",word);
- free(word);
- return 0;
- }
else if (fastncmp("GRADE_",word,6))
{
char *p = word+6;
@@ -10372,8 +10488,8 @@ void DEH_Check(void)
if (dehpowers != NUMPOWERS)
I_Error("You forgot to update the Dehacked powers list, you dolt!\n(%d powers defined, versus %s in the Dehacked list)\n", NUMPOWERS, sizeu1(dehpowers));
- if (dehcolors != MAXTRANSLATIONS)
- I_Error("You forgot to update the Dehacked colors list, you dolt!\n(%d colors defined, versus %s in the Dehacked list)\n", MAXTRANSLATIONS, sizeu1(dehcolors));
+ if (dehcolors != SKINCOLOR_FIRSTFREESLOT)
+ I_Error("You forgot to update the Dehacked colors list, you dolt!\n(%d colors defined, versus %s in the Dehacked list)\n", SKINCOLOR_FIRSTFREESLOT, sizeu1(dehcolors));
#endif
}
@@ -10481,6 +10597,22 @@ static inline int lib_freeslot(lua_State *L)
if (i == NUMMOBJFREESLOTS)
CONS_Alert(CONS_WARNING, "Ran out of free MobjType slots!\n");
}
+ else if (fastcmp(type, "SKINCOLOR"))
+ {
+ skincolornum_t i;
+ for (i = 0; i < NUMCOLORFREESLOTS; i++)
+ if (!FREE_SKINCOLORS[i]) {
+ CONS_Printf("Skincolor SKINCOLOR_%s allocated.\n",word);
+ FREE_SKINCOLORS[i] = Z_Malloc(strlen(word)+1, PU_STATIC, NULL);
+ strcpy(FREE_SKINCOLORS[i],word);
+ M_AddMenuColor(numskincolors++);
+ lua_pushinteger(L, i);
+ r++;
+ break;
+ }
+ if (i == NUMCOLORFREESLOTS)
+ CONS_Alert(CONS_WARNING, "Ran out of free skincolor slots!\n");
+ }
else if (fastcmp(type, "SPR2"))
{
// Search if we already have an SPR2 by that name...
@@ -10812,13 +10944,20 @@ static inline int lib_getenum(lua_State *L)
}
else if (fastncmp("SKINCOLOR_",word,10)) {
p = word+10;
- for (i = 0; i < MAXTRANSLATIONS; i++)
+ for (i = 0; i < NUMCOLORFREESLOTS; i++) {
+ if (!FREE_SKINCOLORS[i])
+ break;
+ if (fastcmp(p, FREE_SKINCOLORS[i])) {
+ lua_pushinteger(L, SKINCOLOR_FIRSTFREESLOT+i);
+ return 1;
+ }
+ }
+ for (i = 0; i < SKINCOLOR_FIRSTFREESLOT; i++)
if (fastcmp(p, COLOR_ENUMS[i])) {
lua_pushinteger(L, i);
return 1;
}
- if (mathlib) return luaL_error(L, "skincolor '%s' could not be found.\n", word);
- return 0;
+ return luaL_error(L, "skincolor '%s' could not be found.\n", word);
}
else if (fastncmp("GRADE_",word,6))
{
diff --git a/src/djgppdos/i_system.c b/src/djgppdos/i_system.c
index dae9ed16e3b426d195bf91c8ee62890fc42d7f48..9f6972fa67663065e65fb29973d99ee60711d1aa 100644
--- a/src/djgppdos/i_system.c
+++ b/src/djgppdos/i_system.c
@@ -61,6 +61,8 @@
#include "../console.h"
+#include "../m_menu.h"
+
#ifdef __GNUG__
#pragma implementation "../i_system.h"
#endif
@@ -555,6 +557,7 @@ void I_Error (const char *error, ...)
if (demorecording)
G_CheckDemoStatus();
D_QuitNetGame ();
+ M_FreePlayerSetupColors();
if (shutdowning)
{
@@ -622,6 +625,7 @@ void I_Quit (void)
if (demorecording)
G_CheckDemoStatus();
D_QuitNetGame ();
+ M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
diff --git a/src/doomdata.h b/src/doomdata.h
index c2ee50c2eec019342c125f667e0204ea4f1193d8..77ed56bc23e853f825159ccbc60b1c7d3f98e823 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -208,10 +208,6 @@ typedef struct
#define ZSHIFT 4
-extern const UINT8 Color_Index[MAXTRANSLATIONS-1][16];
-extern const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS];
-extern const UINT8 Color_Opposite[MAXSKINCOLORS - 1][2];
-
#define NUMMAPS 1035
#endif // __DOOMDATA__
diff --git a/src/doomdef.h b/src/doomdef.h
index 74086ef5d3a850d11060784960930b5154fb83ef..120df85262266d87bfe129139bcaba2f20b34879 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -239,6 +239,20 @@ extern char logfilename[1024];
#define PLAYERSMASK (MAXPLAYERS-1)
#define MAXPLAYERNAME 21
+#define COLORRAMPSIZE 16
+#define MAXCOLORNAME 32
+#define NUMCOLORFREESLOTS 1024
+
+typedef struct skincolor_s
+{
+ char name[MAXCOLORNAME+1]; // Skincolor name
+ UINT8 ramp[COLORRAMPSIZE]; // Colormap ramp
+ UINT16 invcolor; // Signpost color
+ UINT8 invshade; // Signpost color shade
+ UINT16 chatcolor; // Chat color
+ boolean accessible; // Accessible by the color command + setup menu
+} skincolor_t;
+
typedef enum
{
SKINCOLOR_NONE = 0,
@@ -317,12 +331,10 @@ typedef enum
SKINCOLOR_RASPBERRY,
SKINCOLOR_ROSY,
- // SKINCOLOR_? - one left before we bump up against 0x39, which isn't a HARD limit anymore but would be excessive
-
- MAXSKINCOLORS,
+ FIRSTSUPERCOLOR,
// Super special awesome Super flashing colors!
- SKINCOLOR_SUPERSILVER1 = MAXSKINCOLORS,
+ SKINCOLOR_SUPERSILVER1 = FIRSTSUPERCOLOR,
SKINCOLOR_SUPERSILVER2,
SKINCOLOR_SUPERSILVER3,
SKINCOLOR_SUPERSILVER4,
@@ -376,9 +388,17 @@ typedef enum
SKINCOLOR_SUPERTAN4,
SKINCOLOR_SUPERTAN5,
- MAXTRANSLATIONS,
- NUMSUPERCOLORS = ((MAXTRANSLATIONS - MAXSKINCOLORS)/5)
-} skincolors_t;
+ SKINCOLOR_FIRSTFREESLOT,
+ SKINCOLOR_LASTFREESLOT = SKINCOLOR_FIRSTFREESLOT + NUMCOLORFREESLOTS - 1,
+
+ MAXSKINCOLORS,
+
+ NUMSUPERCOLORS = ((SKINCOLOR_FIRSTFREESLOT - FIRSTSUPERCOLOR)/5)
+} skincolornum_t;
+
+UINT16 numskincolors;
+
+extern skincolor_t skincolors[MAXSKINCOLORS];
// State updates, number of tics / second.
// NOTE: used to setup the timer rate, see I_StartupTimer().
diff --git a/src/doomstat.h b/src/doomstat.h
index 57ea3e0496ef4679512ba6c82f029d3396f7bb47..fa346540cf6bb3606c53cc8c90ed048258cbe75d 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -145,7 +145,7 @@ extern INT32 tutorialanalog; // store cv_analog[0] user value
extern boolean looptitle;
// CTF colors.
-extern UINT8 skincolor_redteam, skincolor_blueteam, skincolor_redring, skincolor_bluering;
+extern UINT16 skincolor_redteam, skincolor_blueteam, skincolor_redring, skincolor_bluering;
extern tic_t countdowntimer;
extern boolean countdowntimeup;
diff --git a/src/f_finale.c b/src/f_finale.c
index 825f646b04755cbdce6222c2527dc7aed96143df..8b5a69ae4a2390419856a9366240e5eb20674c6c 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -2185,7 +2185,7 @@ void F_EndingDrawer(void)
for (i = 0; i < 7; ++i)
{
UINT8* colormap;
- skincolors_t col = SKINCOLOR_GREEN;
+ skincolornum_t col = SKINCOLOR_GREEN;
switch (i)
{
case 1:
diff --git a/src/g_demo.c b/src/g_demo.c
index a901e8dea9b135f093940f3aa6d68896ffb592a8..7c949a4c822293e50a1eef11ed1b129f19381a2a 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -68,7 +68,7 @@ static struct {
UINT8 flags; // EZT flags
// EZT_COLOR
- UINT8 color, lastcolor;
+ UINT16 color, lastcolor;
// EZT_SCALE
fixed_t scale, lastscale;
@@ -82,7 +82,8 @@ static struct {
// There is no conflict here.
typedef struct demoghost {
UINT8 checksum[16];
- UINT8 *buffer, *p, color, fadein;
+ UINT8 *buffer, *p, fadein;
+ UINT16 color;
UINT16 version;
mobj_t oldmo, *mo;
struct demoghost *next;
@@ -93,7 +94,7 @@ demoghost *ghosts = NULL;
// DEMO RECORDING
//
-#define DEMOVERSION 0x000c
+#define DEMOVERSION 0x000d
#define DEMOHEADER "\xF0" "SRB2Replay" "\x0F"
#define DF_GHOST 0x01 // This demo contains ghost data too!
@@ -280,13 +281,13 @@ void G_GhostAddColor(ghostcolor_t color)
{
if (!demorecording || !(demoflags & DF_GHOST))
return;
- if (ghostext.lastcolor == (UINT8)color)
+ if (ghostext.lastcolor == (UINT16)color)
{
ghostext.flags &= ~EZT_COLOR;
return;
}
ghostext.flags |= EZT_COLOR;
- ghostext.color = (UINT8)color;
+ ghostext.color = (UINT16)color;
}
void G_GhostAddScale(fixed_t scale)
@@ -425,7 +426,7 @@ void G_WriteGhostTic(mobj_t *ghost)
WRITEUINT8(demo_p,ghostext.flags);
if (ghostext.flags & EZT_COLOR)
{
- WRITEUINT8(demo_p,ghostext.color);
+ WRITEUINT16(demo_p,ghostext.color);
ghostext.lastcolor = ghostext.color;
}
if (ghostext.flags & EZT_SCALE)
@@ -501,7 +502,7 @@ void G_WriteGhostTic(mobj_t *ghost)
WRITEUINT8(demo_p,ghost->player->followmobj->sprite2);
WRITEUINT16(demo_p,ghost->player->followmobj->sprite);
WRITEUINT8(demo_p,(ghost->player->followmobj->frame & FF_FRAMEMASK));
- WRITEUINT8(demo_p,ghost->player->followmobj->color);
+ WRITEUINT16(demo_p,ghost->player->followmobj->color);
*followtic_p = followtic;
}
@@ -566,7 +567,7 @@ void G_ConsGhostTic(void)
{ // But wait, there's more!
UINT8 xziptic = READUINT8(demo_p);
if (xziptic & EZT_COLOR)
- demo_p++;
+ demo_p += (demoversion==0x000c) ? 1 : sizeof(UINT16);
if (xziptic & EZT_SCALE)
demo_p += sizeof(fixed_t);
if (xziptic & EZT_HIT)
@@ -633,7 +634,7 @@ void G_ConsGhostTic(void)
demo_p++;
demo_p += sizeof(UINT16);
demo_p++;
- demo_p++;
+ demo_p += (demoversion==0x000c) ? 1 : sizeof(UINT16);
}
// Re-synchronise
@@ -731,7 +732,7 @@ void G_GhostTicker(void)
xziptic = READUINT8(g->p);
if (xziptic & EZT_COLOR)
{
- g->color = READUINT8(g->p);
+ g->color = (g->version==0x000c) ? READUINT8(g->p) : READUINT16(g->p);
switch(g->color)
{
default:
@@ -864,7 +865,7 @@ void G_GhostTicker(void)
g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4);
break;
case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer)
- g->mo->color = (UINT8)(SKINCOLOR_RUBY + (leveltime % (MAXSKINCOLORS - SKINCOLOR_RUBY))); // Passes through all saturated colours
+ g->mo->color = (UINT16)(SKINCOLOR_RUBY + (leveltime % (FIRSTSUPERCOLOR - SKINCOLOR_RUBY))); // Passes through all saturated colours
break;
default:
break;
@@ -918,7 +919,7 @@ void G_GhostTicker(void)
follow->sprite = READUINT16(g->p);
follow->frame = (READUINT8(g->p)) | (g->mo->frame & FF_TRANSMASK);
follow->angle = g->mo->angle;
- follow->color = READUINT8(g->p);
+ follow->color = (g->version==0x000c) ? READUINT8(g->p) : READUINT16(g->p);
if (!(followtic & FZT_SPAWNED))
{
@@ -1158,7 +1159,7 @@ void G_ReadMetalTic(mobj_t *metal)
follow->sprite = READUINT16(metal_p);
follow->frame = READUINT32(metal_p); // NOT & FF_FRAMEMASK here, so 32 bits
follow->angle = metal->angle;
- follow->color = READUINT8(metal_p);
+ follow->color = (metalversion==0x000c) ? READUINT8(metal_p) : READUINT16(metal_p);
if (!(followtic & FZT_SPAWNED))
{
@@ -1340,7 +1341,7 @@ void G_WriteMetalTic(mobj_t *metal)
WRITEUINT8(demo_p,metal->player->followmobj->sprite2);
WRITEUINT16(demo_p,metal->player->followmobj->sprite);
WRITEUINT32(demo_p,metal->player->followmobj->frame); // NOT & FF_FRAMEMASK here, so 32 bits
- WRITEUINT8(demo_p,metal->player->followmobj->color);
+ WRITEUINT16(demo_p,metal->player->followmobj->color);
*followtic_p = followtic;
}
@@ -1394,7 +1395,7 @@ void G_RecordMetal(void)
void G_BeginRecording(void)
{
UINT8 i;
- char name[16];
+ char name[MAXCOLORNAME+1];
player_t *player = &players[consoleplayer];
if (demo_p)
@@ -1457,12 +1458,12 @@ void G_BeginRecording(void)
demo_p += 16;
// Color
- for (i = 0; i < 16 && cv_playercolor.string[i]; i++)
+ for (i = 0; i < MAXCOLORNAME && cv_playercolor.string[i]; i++)
name[i] = cv_playercolor.string[i];
- for (; i < 16; i++)
+ for (; i < MAXCOLORNAME; i++)
name[i] = '\0';
- M_Memcpy(demo_p,name,16);
- demo_p += 16;
+ M_Memcpy(demo_p,name,MAXCOLORNAME);
+ demo_p += MAXCOLORNAME;
// Stats
WRITEUINT8(demo_p,player->charability);
@@ -1622,7 +1623,7 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname)
c = READUINT8(p); // SUBVERSION
I_Assert(c == SUBVERSION);
s = READUINT16(p);
- I_Assert(s == DEMOVERSION);
+ I_Assert(s >= 0x000c);
p += 16; // demo checksum
I_Assert(!memcmp(p, "PLAY", 4));
p += 4; // PLAY
@@ -1671,6 +1672,7 @@ UINT8 G_CmpDemoTime(char *oldname, char *newname)
switch(oldversion) // demoversion
{
case DEMOVERSION: // latest always supported
+ case 0x000c: // all that changed between then and now was longer color name
break;
// too old, cannot support.
default:
@@ -1744,15 +1746,15 @@ void G_DoPlayDemo(char *defdemoname)
{
UINT8 i;
lumpnum_t l;
- char skin[17],color[17],*n,*pdemoname;
- UINT8 version,subversion,charability,charability2,thrustfactor,accelstart,acceleration;
+ char skin[17],color[MAXCOLORNAME+1],*n,*pdemoname;
+ UINT8 version,subversion,charability,charability2,thrustfactor,accelstart,acceleration,cnamelen;
pflags_t pflags;
UINT32 randseed, followitem;
fixed_t camerascale,shieldscale,actionspd,mindash,maxdash,normalspeed,runspeed,jumpfactor,height,spinheight;
char msg[1024];
skin[16] = '\0';
- color[16] = '\0';
+ color[MAXCOLORNAME] = '\0';
n = defdemoname+strlen(defdemoname);
while (*n != '/' && *n != '\\' && n != defdemoname)
@@ -1810,6 +1812,11 @@ void G_DoPlayDemo(char *defdemoname)
switch(demoversion)
{
case DEMOVERSION: // latest always supported
+ cnamelen = MAXCOLORNAME;
+ break;
+ // all that changed between then and now was longer color name
+ case 0x000c:
+ cnamelen = 16;
break;
// too old, cannot support.
default:
@@ -1876,8 +1883,8 @@ void G_DoPlayDemo(char *defdemoname)
demo_p += 16;
// Color
- M_Memcpy(color,demo_p,16);
- demo_p += 16;
+ M_Memcpy(color,demo_p,cnamelen);
+ demo_p += cnamelen;
charability = READUINT8(demo_p);
charability2 = READUINT8(demo_p);
@@ -1941,7 +1948,9 @@ void G_DoPlayDemo(char *defdemoname)
// Set skin
SetPlayerSkin(0, skin);
+#ifdef HAVE_BLUA
LUAh_MapChange(gamemap);
+#endif
displayplayer = consoleplayer = 0;
memset(playeringame,0,sizeof(playeringame));
playeringame[0] = true;
@@ -1949,8 +1958,9 @@ void G_DoPlayDemo(char *defdemoname)
G_InitNew(false, G_BuildMapName(gamemap), true, true, false);
// Set color
- for (i = 0; i < MAXSKINCOLORS; i++)
- if (!stricmp(Color_Names[i],color))
+ players[0].skincolor = skins[players[0].skin].prefcolor;
+ for (i = 0; i < numskincolors; i++)
+ if (!stricmp(skincolors[i].name,color))
{
players[0].skincolor = i;
break;
@@ -1992,7 +2002,8 @@ void G_AddGhost(char *defdemoname)
{
INT32 i;
lumpnum_t l;
- char name[17],skin[17],color[17],*n,*pdemoname,md5[16];
+ char name[17],skin[17],color[MAXCOLORNAME+1],*n,*pdemoname,md5[16];
+ UINT8 cnamelen;
demoghost *gh;
UINT8 flags;
UINT8 *buffer,*p;
@@ -2047,6 +2058,11 @@ void G_AddGhost(char *defdemoname)
switch(ghostversion)
{
case DEMOVERSION: // latest always supported
+ cnamelen = MAXCOLORNAME;
+ break;
+ // all that changed between then and now was longer color name
+ case 0x000c:
+ cnamelen = 16;
break;
// too old, cannot support.
default:
@@ -2109,8 +2125,8 @@ void G_AddGhost(char *defdemoname)
p += 16;
// Color
- M_Memcpy(color, p,16);
- p += 16;
+ M_Memcpy(color, p,cnamelen);
+ p += cnamelen;
// Ghosts do not have a player structure to put this in.
p++; // charability
@@ -2198,10 +2214,10 @@ void G_AddGhost(char *defdemoname)
// Set color
gh->mo->color = ((skin_t*)gh->mo->skin)->prefcolor;
- for (i = 0; i < MAXSKINCOLORS; i++)
- if (!stricmp(Color_Names[i],color))
+ for (i = 0; i < numskincolors; i++)
+ if (!stricmp(skincolors[i].name,color))
{
- gh->mo->color = (UINT8)i;
+ gh->mo->color = (UINT16)i;
break;
}
gh->oldmo.color = gh->mo->color;
@@ -2292,6 +2308,7 @@ void G_DoPlayMetal(void)
switch(metalversion)
{
case DEMOVERSION: // latest always supported
+ case 0x000c: // all that changed between then and now was longer color name
break;
// too old, cannot support.
default:
diff --git a/src/g_game.c b/src/g_game.c
index 5bcf9f580ad2612fa64619499c0e634e8ad630ba..6b434cb3bfa12c7ccf4e389e9811bbb3d618c373 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -54,7 +54,7 @@ UINT8 ultimatemode = false;
boolean botingame;
UINT8 botskin;
-UINT8 botcolor;
+UINT16 botcolor;
JoyType_t Joystick;
JoyType_t Joystick2;
@@ -135,10 +135,10 @@ INT32 tutorialanalog = 0; // store cv_analog[0] user value
boolean looptitle = false;
-UINT8 skincolor_redteam = SKINCOLOR_RED;
-UINT8 skincolor_blueteam = SKINCOLOR_BLUE;
-UINT8 skincolor_redring = SKINCOLOR_SALMON;
-UINT8 skincolor_bluering = SKINCOLOR_CORNFLOWER;
+UINT16 skincolor_redteam = SKINCOLOR_RED;
+UINT16 skincolor_blueteam = SKINCOLOR_BLUE;
+UINT16 skincolor_redring = SKINCOLOR_SALMON;
+UINT16 skincolor_bluering = SKINCOLOR_CORNFLOWER;
tic_t countdowntimer = 0;
boolean countdowntimeup = false;
@@ -2381,7 +2381,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
INT16 totalring;
UINT8 laps;
UINT8 mare;
- UINT8 skincolor;
+ UINT16 skincolor;
INT32 skin;
UINT32 availabilities;
tic_t jointime;
@@ -4475,7 +4475,7 @@ cleanup:
//
void G_DeferedInitNew(boolean pultmode, const char *mapname, INT32 pickedchar, boolean SSSG, boolean FLS)
{
- UINT8 color = skins[pickedchar].prefcolor;
+ UINT16 color = skins[pickedchar].prefcolor;
paused = false;
if (demoplayback)
diff --git a/src/g_state.h b/src/g_state.h
index 3320ebc47e91e8a78be0ea45a64fd0ba46db19bb..e364c5a35b62c323464783d518bf266b2abe4185 100644
--- a/src/g_state.h
+++ b/src/g_state.h
@@ -57,6 +57,7 @@ extern UINT8 ultimatemode; // was sk_insane
extern gameaction_t gameaction;
extern boolean botingame;
-extern UINT8 botskin, botcolor;
+extern UINT8 botskin;
+extern UINT16 botcolor;
#endif //__G_STATE__
diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c
index b47ac09bfeb321ccc67e870bc2b5c8885aee4de7..e4ea26d861a8189c0668fcb487b907ad995ecc0f 100644
--- a/src/hardware/hw_md2.c
+++ b/src/hardware/hw_md2.c
@@ -677,12 +677,12 @@ spritemodelfound:
#define SETBRIGHTNESS(brightness,r,g,b) \
brightness = (UINT8)(((1063*(UINT16)(r))/5000) + ((3576*(UINT16)(g))/5000) + ((361*(UINT16)(b))/5000))
-static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, GLMipmap_t *grmip, INT32 skinnum, skincolors_t color)
+static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, GLMipmap_t *grmip, INT32 skinnum, skincolornum_t color)
{
UINT16 w = gpatch->width, h = gpatch->height;
UINT32 size = w*h;
RGBA_t *image, *blendimage, *cur, blendcolor;
- UINT8 translation[16]; // First the color index
+ UINT16 translation[16]; // First the color index
UINT8 cutoff[16]; // Brightness cutoff before using the next color
UINT8 translen = 0;
UINT8 i;
@@ -718,16 +718,16 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
if (skinnum == TC_METALSONIC)
color = SKINCOLOR_COBALT;
- if (color != SKINCOLOR_NONE)
+ if (color != SKINCOLOR_NONE && color < numskincolors)
{
UINT8 numdupes = 1;
- translation[translen] = Color_Index[color-1][0];
+ translation[translen] = skincolors[color].ramp[0];
cutoff[translen] = 255;
for (i = 1; i < 16; i++)
{
- if (translation[translen] == Color_Index[color-1][i])
+ if (translation[translen] == skincolors[color].ramp[i])
{
numdupes++;
continue;
@@ -741,7 +741,7 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch,
numdupes = 1;
translen++;
- translation[translen] = (UINT8)Color_Index[color-1][i];
+ translation[translen] = (UINT16)skincolors[color].ramp[i];
}
translen++;
@@ -1043,7 +1043,7 @@ skippixel:
#undef SETBRIGHTNESS
-static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT32 skinnum, const UINT8 *colormap, skincolors_t color)
+static void HWR_GetBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, INT32 skinnum, const UINT8 *colormap, skincolornum_t color)
{
// mostly copied from HWR_GetMappedPatch, hence the similarities and comment
GLMipmap_t *grmip, *newmip;
@@ -1336,7 +1336,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
else
skinnum = TC_BOSS;
}
- else if ((skincolors_t)spr->mobj->color != SKINCOLOR_NONE)
+ else if ((skincolornum_t)spr->mobj->color != SKINCOLOR_NONE)
{
if (spr->mobj->colorized)
skinnum = TC_RAINBOW;
@@ -1356,7 +1356,7 @@ boolean HWR_DrawModel(gr_vissprite_t *spr)
}
// Translation or skin number found
- HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, skinnum, spr->colormap, (skincolors_t)spr->mobj->color);
+ HWR_GetBlendedTexture(gpatch, (GLPatch_t *)md2->blendgrpatch, skinnum, spr->colormap, (skincolornum_t)spr->mobj->color);
}
else
{
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 3ff9db2b66a39737bcbdc04260c3842e1bc6cf1d..6f2319a50cc4eb83e5aaccd77f7c9f2d81313b9c 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -755,113 +755,40 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
}
else
{
- const UINT8 color = players[playernum].skincolor;
-
- cstart = "\x83";
-
- // Follow palette order at r_draw.c Color_Names
- switch (color)
- {
- default:
- case SKINCOLOR_WHITE:
- case SKINCOLOR_BONE:
- case SKINCOLOR_CLOUDY:
- case SKINCOLOR_GREY:
- case SKINCOLOR_SILVER:
- case SKINCOLOR_AETHER:
- case SKINCOLOR_SLATE:
- cstart = "\x80"; // white
- break;
- case SKINCOLOR_CARBON:
- case SKINCOLOR_JET:
- case SKINCOLOR_BLACK:
- cstart = "\x86"; // V_GRAYMAP
- break;
- case SKINCOLOR_PINK:
- case SKINCOLOR_RUBY:
- case SKINCOLOR_SALMON:
- case SKINCOLOR_RED:
- case SKINCOLOR_CRIMSON:
- case SKINCOLOR_FLAME:
- case SKINCOLOR_KETCHUP:
- cstart = "\x85"; // V_REDMAP
- break;
- case SKINCOLOR_YOGURT:
- case SKINCOLOR_BROWN:
- case SKINCOLOR_BRONZE:
- case SKINCOLOR_TAN:
- case SKINCOLOR_BEIGE:
- case SKINCOLOR_QUAIL:
- cstart = "\x8d"; // V_BROWNMAP
- break;
- case SKINCOLOR_MOSS:
- case SKINCOLOR_GREEN:
- case SKINCOLOR_FOREST:
- case SKINCOLOR_EMERALD:
- case SKINCOLOR_MINT:
- cstart = "\x83"; // V_GREENMAP
- break;
- case SKINCOLOR_AZURE:
- cstart = "\x8c"; // V_AZUREMAP
- break;
- case SKINCOLOR_LAVENDER:
- case SKINCOLOR_PASTEL:
- case SKINCOLOR_PURPLE:
- cstart = "\x89"; // V_PURPLEMAP
- break;
- case SKINCOLOR_PEACHY:
- case SKINCOLOR_LILAC:
- case SKINCOLOR_PLUM:
- case SKINCOLOR_ROSY:
- cstart = "\x8e"; // V_ROSYMAP
- break;
- case SKINCOLOR_SUNSET:
- case SKINCOLOR_COPPER:
- case SKINCOLOR_APRICOT:
- case SKINCOLOR_ORANGE:
- case SKINCOLOR_RUST:
- cstart = "\x87"; // V_ORANGEMAP
- break;
- case SKINCOLOR_GOLD:
- case SKINCOLOR_SANDY:
- case SKINCOLOR_YELLOW:
- case SKINCOLOR_OLIVE:
- cstart = "\x82"; // V_YELLOWMAP
- break;
- case SKINCOLOR_LIME:
- case SKINCOLOR_PERIDOT:
- case SKINCOLOR_APPLE:
- cstart = "\x8b"; // V_PERIDOTMAP
- break;
- case SKINCOLOR_SEAFOAM:
- case SKINCOLOR_AQUA:
- cstart = "\x8a"; // V_AQUAMAP
- break;
- case SKINCOLOR_TEAL:
- case SKINCOLOR_WAVE:
- case SKINCOLOR_CYAN:
- case SKINCOLOR_SKY:
- case SKINCOLOR_CERULEAN:
- case SKINCOLOR_ICY:
- case SKINCOLOR_SAPPHIRE:
- case SKINCOLOR_VAPOR:
- cstart = "\x88"; // V_SKYMAP
- break;
- case SKINCOLOR_CORNFLOWER:
- case SKINCOLOR_BLUE:
- case SKINCOLOR_COBALT:
- case SKINCOLOR_DUSK:
- case SKINCOLOR_BLUEBELL:
- cstart = "\x84"; // V_BLUEMAP
- break;
- case SKINCOLOR_BUBBLEGUM:
- case SKINCOLOR_MAGENTA:
- case SKINCOLOR_NEON:
- case SKINCOLOR_VIOLET:
- case SKINCOLOR_RASPBERRY:
- cstart = "\x81"; // V_MAGENTAMAP
- break;
- }
+ UINT16 chatcolor = skincolors[players[playernum].skincolor].chatcolor;
+
+ if (!chatcolor || chatcolor%0x1000 || chatcolor>V_INVERTMAP)
+ cstart = "\x80";
+ else if (chatcolor == V_MAGENTAMAP)
+ cstart = "\x81";
+ else if (chatcolor == V_YELLOWMAP)
+ cstart = "\x82";
+ else if (chatcolor == V_GREENMAP)
+ cstart = "\x83";
+ else if (chatcolor == V_BLUEMAP)
+ cstart = "\x84";
+ else if (chatcolor == V_REDMAP)
+ cstart = "\x85";
+ else if (chatcolor == V_GRAYMAP)
+ cstart = "\x86";
+ else if (chatcolor == V_ORANGEMAP)
+ cstart = "\x87";
+ else if (chatcolor == V_SKYMAP)
+ cstart = "\x88";
+ else if (chatcolor == V_PURPLEMAP)
+ cstart = "\x89";
+ else if (chatcolor == V_AQUAMAP)
+ cstart = "\x8a";
+ else if (chatcolor == V_PERIDOTMAP)
+ cstart = "\x8b";
+ else if (chatcolor == V_AZUREMAP)
+ cstart = "\x8c";
+ else if (chatcolor == V_BROWNMAP)
+ cstart = "\x8d";
+ else if (chatcolor == V_ROSYMAP)
+ cstart = "\x8e";
+ else if (chatcolor == V_INVERTMAP)
+ cstart = "\x8f";
}
prefix = cstart;
diff --git a/src/info.c b/src/info.c
index d443e035d004c8437401d89d31a1e6a1186284c5..f0272fc79da8aa54131151664f5e41f278a85d5b 100644
--- a/src/info.c
+++ b/src/info.c
@@ -20,6 +20,7 @@
#include "m_misc.h"
#include "z_zone.h"
#include "d_player.h"
+#include "v_video.h" // V_*MAP constants
#include "lzf.h"
#ifdef HWRENDER
#include "hardware/hw_light.h"
@@ -21616,8 +21617,140 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
#endif
};
+skincolor_t skincolors[MAXSKINCOLORS] = {
+ {"None", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, SKINCOLOR_NONE, 0, 0, false}, // SKINCOLOR_NONE
+
+ // Greyscale ranges
+ {"White", {0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11}, SKINCOLOR_BLACK, 5, 0, true}, // SKINCOLOR_WHITE
+ {"Bone", {0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x05, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11, 0x12}, SKINCOLOR_JET, 7, 0, true}, // SKINCOLOR_BONE
+ {"Cloudy", {0x02, 0x03, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14}, SKINCOLOR_CARBON, 7, 0, true}, // SKINCOLOR_CLOUDY
+ {"Grey", {0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}, SKINCOLOR_AETHER, 12, 0, true}, // SKINCOLOR_GREY
+ {"Silver", {0x02, 0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d, 0x1f}, SKINCOLOR_SLATE, 12, 0, true}, // SKINCOLOR_SILVER
+ {"Carbon", {0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16, 0x17, 0x17, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1c, 0x1d}, SKINCOLOR_CLOUDY, 7, V_GRAYMAP, true}, // SKINCOLOR_CARBON
+ {"Jet", {0x00, 0x05, 0x0a, 0x0f, 0x14, 0x19, 0x1a, 0x1b, 0x1c, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f}, SKINCOLOR_BONE, 7, V_GRAYMAP, true}, // SKINCOLOR_JET
+ {"Black", {0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1b, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f}, SKINCOLOR_WHITE, 7, V_GRAYMAP, true}, // SKINCOLOR_BLACK
+
+ // Desaturated
+ {"Aether", {0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x91, 0x91, 0x91, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xaf}, SKINCOLOR_GREY, 15, 0, true}, // SKINCOLOR_AETHER
+ {"Slate", {0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0xaa, 0xaa, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xad, 0xae, 0xaf}, SKINCOLOR_SILVER, 12, 0, true}, // SKINCOLOR_SLATE
+ {"Bluebell", {0x90, 0x91, 0x92, 0x93, 0x94, 0x94, 0x95, 0xac, 0xac, 0xad, 0xad, 0xa8, 0xa8, 0xa9, 0xfd, 0xfe}, SKINCOLOR_COPPER, 4, V_BLUEMAP, true}, // SKINCOLOR_BLUEBELL
+ {"Pink", {0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0xd3, 0xd3, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0x2b, 0x2c, 0x2e}, SKINCOLOR_AZURE, 9, V_REDMAP, true}, // SKINCOLOR_PINK
+ {"Yogurt", {0xd0, 0x30, 0xd8, 0xd9, 0xda, 0xdb, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe3, 0xe6, 0xe8, 0xe9}, SKINCOLOR_RUST, 7, V_BROWNMAP, true}, // SKINCOLOR_YOGURT
+ {"Brown", {0xdf, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef}, SKINCOLOR_TAN, 2, V_BROWNMAP, true}, // SKINCOLOR_BROWN
+ {"Bronze", {0xde, 0xe0, 0xe1, 0xe4, 0xe7, 0xe9, 0xeb, 0xec, 0xed, 0xed, 0xed, 0x19, 0x19, 0x1b, 0x1d, 0x1e}, SKINCOLOR_KETCHUP, 0, V_BROWNMAP, true}, // SKINCOLOR_BRONZE
+ {"Tan", {0x51, 0x51, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x56, 0x57, 0xf5, 0xf5, 0xf9, 0xf9, 0xed, 0xed}, SKINCOLOR_BROWN, 12, V_BROWNMAP, true}, // SKINCOLOR_TAN
+ {"Beige", {0x54, 0x55, 0x56, 0x56, 0xf2, 0xf3, 0xf3, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfb, 0xed, 0xed}, SKINCOLOR_MOSS, 5, V_BROWNMAP, true}, // SKINCOLOR_BEIGE
+ {"Moss", {0x58, 0x58, 0x59, 0x59, 0x5a, 0x5a, 0x5b, 0x5b, 0x5b, 0x5c, 0x5d, 0x5d, 0x5e, 0x5e, 0x5f, 0x5f}, SKINCOLOR_BEIGE, 13, V_GREENMAP, true}, // SKINCOLOR_MOSS
+ {"Azure", {0x90, 0x90, 0x91, 0x91, 0xaa, 0xaa, 0xab, 0xab, 0xab, 0xac, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf}, SKINCOLOR_PINK, 5, V_AZUREMAP, true}, // SKINCOLOR_AZURE
+ {"Lavender", {0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc2, 0xc3, 0xc3, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7}, SKINCOLOR_GOLD, 4, V_PURPLEMAP, true}, // SKINCOLOR_LAVENDER
+
+ // Viv's vivid colours (toast 21/07/17)
+ {"Ruby", {0xb0, 0xb0, 0xc9, 0xca, 0xcc, 0x26, 0x27, 0x28, 0x29, 0x2a, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfd}, SKINCOLOR_EMERALD, 10, V_REDMAP, true}, // SKINCOLOR_RUBY
+ {"Salmon", {0xd0, 0xd0, 0xd1, 0xd2, 0x20, 0x21, 0x24, 0x25, 0x26, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e}, SKINCOLOR_FOREST, 6, V_REDMAP, true}, // SKINCOLOR_SALMON
+ {"Red", {0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x47, 0x2e, 0x2f}, SKINCOLOR_GREEN, 10, V_REDMAP, true}, // SKINCOLOR_RED
+ {"Crimson", {0x27, 0x27, 0x28, 0x28, 0x29, 0x2a, 0x2b, 0x2b, 0x2c, 0x2d, 0x2e, 0x2e, 0x2e, 0x2f, 0x2f, 0x1f}, SKINCOLOR_ICY, 10, V_REDMAP, true}, // SKINCOLOR_CRIMSON
+ {"Flame", {0x31, 0x32, 0x33, 0x36, 0x22, 0x22, 0x25, 0x25, 0x25, 0xcd, 0xcf, 0xcf, 0xc5, 0xc5, 0xc7, 0xc7}, SKINCOLOR_PURPLE, 8, V_REDMAP, true}, // SKINCOLOR_FLAME
+ {"Ketchup", {0x48, 0x49, 0x40, 0x33, 0x34, 0x36, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2b, 0x2c, 0x47, 0x2e, 0x2f}, SKINCOLOR_BRONZE, 8, V_REDMAP, true}, // SKINCOLOR_KETCHUP
+ {"Peachy", {0xd0, 0x30, 0x31, 0x31, 0x32, 0x32, 0xdc, 0xdc, 0xdc, 0xd3, 0xd4, 0xd4, 0xcc, 0xcd, 0xce, 0xcf}, SKINCOLOR_TEAL, 7, V_ROSYMAP, true}, // SKINCOLOR_PEACHY
+ {"Quail", {0xd8, 0xd9, 0xdb, 0xdc, 0xde, 0xdf, 0xd5, 0xd5, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0x1d, 0x1f}, SKINCOLOR_WAVE, 5, V_BROWNMAP, true}, // SKINCOLOR_QUAIL
+ {"Sunset", {0x51, 0x52, 0x40, 0x40, 0x34, 0x36, 0xd5, 0xd5, 0xd6, 0xd7, 0xcf, 0xcf, 0xc6, 0xc6, 0xc7, 0xfe}, SKINCOLOR_SAPPHIRE, 5, V_ORANGEMAP, true}, // SKINCOLOR_SUNSET
+ {"Copper", {0x58, 0x54, 0x40, 0x34, 0x35, 0x38, 0x3a, 0x3c, 0x3d, 0x2a, 0x2b, 0x2c, 0x2c, 0xba, 0xba, 0xbb}, SKINCOLOR_BLUEBELL, 5, V_ORANGEMAP, true}, // SKINCOLOR_COPPER
+ {"Apricot", {0x00, 0xd8, 0xd9, 0xda, 0xdb, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e}, SKINCOLOR_CYAN, 4, V_ORANGEMAP, true}, // SKINCOLOR_APRICOT
+ {"Orange", {0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x2c}, SKINCOLOR_BLUE, 4, V_ORANGEMAP, true}, // SKINCOLOR_ORANGE
+ {"Rust", {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3c, 0x3d, 0x3d, 0x3d, 0x3f, 0x2c, 0x2d, 0x47, 0x2e, 0x2f, 0x2f}, SKINCOLOR_YOGURT, 8, V_ORANGEMAP, true}, // SKINCOLOR_RUST
+ {"Gold", {0x51, 0x51, 0x54, 0x54, 0x41, 0x42, 0x43, 0x43, 0x44, 0x45, 0x46, 0x3f, 0x2d, 0x2e, 0x2f, 0x2f}, SKINCOLOR_LAVENDER, 10, V_YELLOWMAP, true}, // SKINCOLOR_GOLD
+ {"Sandy", {0x53, 0x40, 0x41, 0x42, 0x43, 0xe6, 0xe9, 0xe9, 0xea, 0xec, 0xec, 0xc6, 0xc6, 0xc7, 0xc7, 0xfe}, SKINCOLOR_SKY, 8, V_YELLOWMAP, true}, // SKINCOLOR_SANDY
+ {"Yellow", {0x52, 0x53, 0x49, 0x49, 0x4a, 0x4a, 0x4b, 0x4b, 0x4b, 0x4c, 0x4d, 0x4d, 0x4e, 0x4e, 0x4f, 0xed}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, true}, // SKINCOLOR_YELLOW
+ {"Olive", {0x4b, 0x4b, 0x4c, 0x4c, 0x4d, 0x4e, 0xe7, 0xe7, 0xe9, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7, 0xfd}, SKINCOLOR_DUSK, 3, V_YELLOWMAP, true}, // SKINCOLOR_OLIVE
+ {"Lime", {0x50, 0x51, 0x52, 0x53, 0x48, 0xbc, 0xbd, 0xbe, 0xbe, 0xbf, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, SKINCOLOR_MAGENTA, 9, V_PERIDOTMAP, true}, // SKINCOLOR_LIME
+ {"Peridot", {0x58, 0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbe, 0xbe, 0xbe, 0xbf, 0x5e, 0x5e, 0x5f, 0x5f, 0x77, 0x77}, SKINCOLOR_COBALT, 2, V_PERIDOTMAP, true}, // SKINCOLOR_PERIDOT
+ {"Apple", {0x49, 0x49, 0xbc, 0xbd, 0xbe, 0xbe, 0xbe, 0x67, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6d}, SKINCOLOR_RASPBERRY, 13, V_PERIDOTMAP, true}, // SKINCOLOR_APPLE
+ {"Green", {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, SKINCOLOR_RED, 6, V_GREENMAP, true}, // SKINCOLOR_GREEN
+ {"Forest", {0x65, 0x66, 0x67, 0x68, 0x69, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6e, 0x6e, 0x6e, 0x6f}, SKINCOLOR_SALMON, 9, V_GREENMAP, true}, // SKINCOLOR_FOREST
+ {"Emerald", {0x70, 0x70, 0x71, 0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x75, 0x75, 0x76, 0x76, 0x77, 0x77}, SKINCOLOR_RUBY, 4, V_GREENMAP, true}, // SKINCOLOR_EMERALD
+ {"Mint", {0x00, 0x00, 0x58, 0x58, 0x59, 0x62, 0x62, 0x62, 0x64, 0x67, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a}, SKINCOLOR_VIOLET, 5, V_GREENMAP, true}, // SKINCOLOR_MINT
+ {"Seafoam", {0x01, 0x58, 0x59, 0x5a, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0xfd, 0xfd}, SKINCOLOR_PLUM, 6, V_AQUAMAP, true}, // SKINCOLOR_SEAFOAM
+ {"Aqua", {0x78, 0x79, 0x7a, 0x7a, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c, 0x7d, 0x7e, 0x7e, 0x7f, 0x7f, 0x76, 0x77}, SKINCOLOR_ROSY, 7, V_AQUAMAP, true}, // SKINCOLOR_AQUA
+ {"Teal", {0x78, 0x78, 0x8c, 0x8c, 0x8d, 0x8d, 0x8d, 0x8e, 0x8e, 0x8f, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0x8a}, SKINCOLOR_PEACHY, 7, V_SKYMAP, true}, // SKINCOLOR_TEAL
+ {"Wave", {0x00, 0x78, 0x78, 0x79, 0x8d, 0x87, 0x88, 0x89, 0x89, 0xae, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfd}, SKINCOLOR_QUAIL, 5, V_SKYMAP, true}, // SKINCOLOR_WAVE
+ {"Cyan", {0x80, 0x81, 0xff, 0xff, 0x83, 0x83, 0x8d, 0x8d, 0x8d, 0x8e, 0x7e, 0x7f, 0x76, 0x76, 0x77, 0x6e}, SKINCOLOR_APRICOT, 6, V_SKYMAP, true}, // SKINCOLOR_CYAN
+ {"Sky", {0x80, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x85, 0x85, 0x86, 0x87, 0x88, 0x89, 0x89, 0x8a, 0x8b}, SKINCOLOR_SANDY, 1, V_SKYMAP, true}, // SKINCOLOR_SKY
+ {"Cerulean", {0x85, 0x86, 0x87, 0x88, 0x88, 0x89, 0x89, 0x89, 0x8a, 0x8a, 0xfd, 0xfd, 0xfd, 0x1f, 0x1f, 0x1f}, SKINCOLOR_NEON, 4, V_SKYMAP, true}, // SKINCOLOR_CERULEAN
+ {"Icy", {0x00, 0x00, 0x00, 0x00, 0x80, 0x81, 0x83, 0x83, 0x86, 0x87, 0x95, 0x95, 0xad, 0xad, 0xae, 0xaf}, SKINCOLOR_CRIMSON, 0, V_SKYMAP, true}, // SKINCOLOR_ICY
+ {"Sapphire", {0x80, 0x83, 0x86, 0x87, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, SKINCOLOR_SUNSET, 5, V_SKYMAP, true}, // SKINCOLOR_SAPPHIRE
+ {"Cornflower", {0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x9a, 0x9c, 0x9d, 0x9d, 0x9e, 0x9e, 0x9e}, SKINCOLOR_YELLOW, 4, V_BLUEMAP, true}, // SKINCOLOR_CORNFLOWER
+ {"Blue", {0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, SKINCOLOR_ORANGE, 5, V_BLUEMAP, true}, // SKINCOLOR_BLUE
+ {"Cobalt", {0x93, 0x94, 0x95, 0x96, 0x98, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfd, 0xfe, 0xfe}, SKINCOLOR_PERIDOT, 5, V_BLUEMAP, true}, // SKINCOLOR_COBALT
+ {"Vapor", {0x80, 0x81, 0x83, 0x86, 0x94, 0x94, 0xa3, 0xa3, 0xa4, 0xa6, 0xa6, 0xa6, 0xa8, 0xa8, 0xa9, 0xa9}, SKINCOLOR_LILAC, 4, V_SKYMAP, true}, // SKINCOLOR_VAPOR
+ {"Dusk", {0x92, 0x93, 0x94, 0x94, 0xac, 0xad, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf, 0xa9, 0xa9, 0xfd, 0xfd}, SKINCOLOR_OLIVE, 0, V_BLUEMAP, true}, // SKINCOLOR_DUSK
+ {"Pastel", {0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, SKINCOLOR_BUBBLEGUM, 9, V_PURPLEMAP, true}, // SKINCOLOR_PASTEL
+ {"Purple", {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa5, 0xa6, 0xa7, 0xa7, 0xa8, 0xa8, 0xa9, 0xa9}, SKINCOLOR_FLAME, 7, V_PURPLEMAP, true}, // SKINCOLOR_PURPLE
+ {"Bubblegum", {0x00, 0xd0, 0xd0, 0xc8, 0xc8, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, SKINCOLOR_PASTEL, 8, V_MAGENTAMAP, true}, // SKINCOLOR_BUBBLEGUM
+ {"Magenta", {0xb3, 0xb3, 0xb4, 0xb5, 0xb6, 0xb6, 0xb7, 0xb7, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb}, SKINCOLOR_LIME, 6, V_MAGENTAMAP, true}, // SKINCOLOR_MAGENTA
+ {"Neon", {0xb3, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb, 0xc7, 0xc7, 0x1d, 0x1d, 0x1e}, SKINCOLOR_CERULEAN, 2, V_MAGENTAMAP, true}, // SKINCOLOR_NEON
+ {"Violet", {0xd0, 0xd1, 0xd2, 0xca, 0xcc, 0xb8, 0xb9, 0xb9, 0xba, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfe, 0xfe}, SKINCOLOR_MINT, 6, V_MAGENTAMAP, true}, // SKINCOLOR_VIOLET
+ {"Lilac", {0x00, 0xd0, 0xd1, 0xd2, 0xd3, 0xc1, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xfe, 0x1f}, SKINCOLOR_VAPOR, 4, V_ROSYMAP, true}, // SKINCOLOR_LILAC
+ {"Plum", {0xc8, 0xd3, 0xd5, 0xd6, 0xd7, 0xce, 0xcf, 0xb9, 0xb9, 0xba, 0xba, 0xa9, 0xa9, 0xa9, 0xfd, 0xfe}, SKINCOLOR_MINT, 7, V_ROSYMAP, true}, // SKINCOLOR_PLUM
+ {"Raspberry", {0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xcd, 0xce, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfe, 0xfe}, SKINCOLOR_APPLE, 15, V_MAGENTAMAP, true}, // SKINCOLOR_RASPBERRY
+ {"Rosy", {0xfc, 0xc8, 0xc8, 0xc9, 0xc9, 0xca, 0xca, 0xcb, 0xcb, 0xcc, 0xcc, 0xcd, 0xcd, 0xce, 0xce, 0xcf}, SKINCOLOR_AQUA, 1, V_ROSYMAP, true}, // SKINCOLOR_ROSY
+
+ // super
+ {"Super Silver 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03}, SKINCOLOR_BLACK, 15, 0, false}, // SKINCOLOR_SUPERSILVER1
+ {"Super Silver 2", {0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07}, SKINCOLOR_BLACK, 6, 0, false}, // SKINCOLOR_SUPERSILVER2
+ {"Super Silver 3", {0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b}, SKINCOLOR_BLACK, 5, 0, false}, // SKINCOLOR_SUPERSILVER3
+ {"Super Silver 4", {0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11}, SKINCOLOR_BLACK, 5, V_GRAYMAP, false}, // SKINCOLOR_SUPERSILVER4
+ {"Super Silver 5", {0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13}, SKINCOLOR_BLACK, 5, V_GRAYMAP, false}, // SKINCOLOR_SUPERSILVER5
+
+ {"Super Red 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2}, SKINCOLOR_CYAN, 15, 0, false}, // SKINCOLOR_SUPERRED1
+ {"Super Red 2", {0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd0, 0xd1, 0xd1, 0xd1, 0xd2, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21}, SKINCOLOR_CYAN, 14, V_ROSYMAP, false}, // SKINCOLOR_SUPERRED2
+ {"Super Red 3", {0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23}, SKINCOLOR_CYAN, 13, V_REDMAP, false}, // SKINCOLOR_SUPERRED3
+ {"Super Red 4", {0x00, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24}, SKINCOLOR_CYAN, 11, V_REDMAP, false}, // SKINCOLOR_SUPERRED4
+ {"Super Red 5", {0xd0, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25}, SKINCOLOR_CYAN, 10, V_REDMAP, false}, // SKINCOLOR_SUPERRED5
+
+ {"Super Orange 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34}, SKINCOLOR_SAPPHIRE, 15, 0, false}, // SKINCOLOR_SUPERORANGE1
+ {"Super Orange 2", {0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34}, SKINCOLOR_SAPPHIRE, 12, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE2
+ {"Super Orange 3", {0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x35}, SKINCOLOR_SAPPHIRE, 9, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE3
+ {"Super Orange 4", {0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46}, SKINCOLOR_SAPPHIRE, 4, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE4
+ {"Super Orange 5", {0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46, 0x47}, SKINCOLOR_SAPPHIRE, 3, V_ORANGEMAP, false}, // SKINCOLOR_SUPERORANGE5
+
+ {"Super Gold 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x52, 0x53, 0x48}, SKINCOLOR_CORNFLOWER, 15, 0, false}, // SKINCOLOR_SUPERGOLD1
+ {"Super Gold 2", {0x00, 0x50, 0x51, 0x52, 0x53, 0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41}, SKINCOLOR_CORNFLOWER, 9, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD2
+ {"Super Gold 3", {0x51, 0x52, 0x53, 0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD3
+ {"Super Gold 4", {0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD4
+ {"Super Gold 5", {0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47}, SKINCOLOR_CORNFLOWER, 8, V_YELLOWMAP, false}, // SKINCOLOR_SUPERGOLD5
+
+ {"Super Peridot 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc}, SKINCOLOR_COBALT, 15, 0, false}, // SKINCOLOR_SUPERPERIDOT1
+ {"Super Peridot 2", {0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe}, SKINCOLOR_COBALT, 4, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT2
+ {"Super Peridot 3", {0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf}, SKINCOLOR_COBALT, 3, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT3
+ {"Super Peridot 4", {0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f}, SKINCOLOR_COBALT, 3, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT4
+ {"Super Peridot 5", {0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f, 0x77}, SKINCOLOR_COBALT, 3, V_PERIDOTMAP, false}, // SKINCOLOR_SUPERPERIDOT5
+
+ {"Super Sky 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x81, 0x82, 0x83, 0x84}, SKINCOLOR_RUST, 15, 0, false}, // SKINCOLOR_SUPERSKY1
+ {"Super Sky 2", {0x00, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86}, SKINCOLOR_RUST, 4, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY2
+ {"Super Sky 3", {0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87}, SKINCOLOR_RUST, 3, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY3
+ {"Super Sky 4", {0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a}, SKINCOLOR_RUST, 3, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY4
+ {"Super Sky 5", {0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a, 0x8b}, SKINCOLOR_RUST, 3, V_SKYMAP, false}, // SKINCOLOR_SUPERSKY5
+
+ {"Super Purple 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa2}, SKINCOLOR_EMERALD, 15, 0, false}, // SKINCOLOR_SUPERPURPLE1
+ {"Super Purple 2", {0x00, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5}, SKINCOLOR_EMERALD, 4, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE2
+ {"Super Purple 3", {0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6}, SKINCOLOR_EMERALD, 0, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE3
+ {"Super Purple 4", {0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9}, SKINCOLOR_EMERALD, 0, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE4
+ {"Super Purple 5", {0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9, 0xfd}, SKINCOLOR_EMERALD, 0, V_PURPLEMAP, false}, // SKINCOLOR_SUPERPURPLE5
+
+ {"Super Rust 1", {0x00, 0xd0, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x32, 0x33, 0x37, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x2e}, SKINCOLOR_CYAN, 14, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST1
+ {"Super Rust 2", {0x30, 0x31, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x38, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x47, 0x2e}, SKINCOLOR_CYAN, 10, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST2
+ {"Super Rust 3", {0x31, 0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x3a, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x2e, 0x2e}, SKINCOLOR_CYAN, 9, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST3
+ {"Super Rust 4", {0x48, 0x40, 0x41, 0x42, 0x43, 0x44, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x47, 0x2e, 0x2e, 0x2e}, SKINCOLOR_CYAN, 8, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST4
+ {"Super Rust 5", {0x41, 0x42, 0x43, 0x43, 0x44, 0x44, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xed, 0xee, 0xee, 0xef, 0xef}, SKINCOLOR_CYAN, 8, V_ORANGEMAP, false}, // SKINCOLOR_SUPERRUST5
+
+ {"Super Tan 1", {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52}, SKINCOLOR_BROWN, 14, 0, false}, // SKINCOLOR_SUPERTAN1
+ {"Super Tan 2", {0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5}, SKINCOLOR_BROWN, 13, V_BROWNMAP, false}, // SKINCOLOR_SUPERTAN2
+ {"Super Tan 3", {0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9}, SKINCOLOR_BROWN, 12, V_BROWNMAP, false}, // SKINCOLOR_SUPERTAN3
+ {"Super Tan 4", {0x51, 0x52, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed}, SKINCOLOR_BROWN, 11, V_BROWNMAP, false}, // SKINCOLOR_SUPERTAN4
+ {"Super Tan 5", {0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed, 0xee, 0xef, 0xef}, SKINCOLOR_BROWN, 10, V_BROWNMAP, false} // SKINCOLOR_SUPERTAN5
+};
-/** Patches the mobjinfo table and state table.
+/** Patches the mobjinfo, state, and skincolor tables.
* Free slots are emptied out and set to initial values.
*/
void P_PatchInfoTables(void)
@@ -21645,6 +21778,11 @@ void P_PatchInfoTables(void)
sprnames[i][0] = '\0'; // i == NUMSPRITES
memset(&states[S_FIRSTFREESLOT], 0, sizeof (state_t) * NUMSTATEFREESLOTS);
memset(&mobjinfo[MT_FIRSTFREESLOT], 0, sizeof (mobjinfo_t) * NUMMOBJFREESLOTS);
+ memset(&skincolors[SKINCOLOR_FIRSTFREESLOT], 0, sizeof (skincolor_t) * NUMCOLORFREESLOTS);
+ for (i = SKINCOLOR_FIRSTFREESLOT; i <= SKINCOLOR_LASTFREESLOT; i++) {
+ skincolors[i].accessible = false;
+ skincolors[i].name[0] = '\0';
+ }
for (i = MT_FIRSTFREESLOT; i <= MT_LASTFREESLOT; i++)
mobjinfo[i].doomednum = -1;
}
@@ -21653,7 +21791,8 @@ void P_PatchInfoTables(void)
static char *sprnamesbackup;
static state_t *statesbackup;
static mobjinfo_t *mobjinfobackup;
-static size_t sprnamesbackupsize, statesbackupsize, mobjinfobackupsize;
+static skincolor_t *skincolorsbackup;
+static size_t sprnamesbackupsize, statesbackupsize, mobjinfobackupsize, skincolorsbackupsize;
#endif
void P_BackupTables(void)
@@ -21663,6 +21802,7 @@ void P_BackupTables(void)
sprnamesbackup = Z_Malloc(sizeof(sprnames), PU_STATIC, NULL);
statesbackup = Z_Malloc(sizeof(states), PU_STATIC, NULL);
mobjinfobackup = Z_Malloc(sizeof(mobjinfo), PU_STATIC, NULL);
+ skincolorsbackup = Z_Malloc(sizeof(skincolors), PU_STATIC, NULL);
// Sprite names
sprnamesbackupsize = lzf_compress(sprnames, sizeof(sprnames), sprnamesbackup, sizeof(sprnames));
@@ -21684,6 +21824,13 @@ void P_BackupTables(void)
mobjinfobackup = Z_Realloc(mobjinfobackup, mobjinfobackupsize, PU_STATIC, NULL);
else
M_Memcpy(mobjinfobackup, mobjinfo, sizeof(mobjinfo));
+
+ //Skincolor info
+ skincolorsbackupsize = lzf_compress(skincolors, sizeof(skincolors), skincolorsbackup, sizeof(skincolors));
+ if (skincolorsbackupsize > 0)
+ skincolorsbackup = Z_Realloc(skincolorsbackup, skincolorsbackupsize, PU_STATIC, NULL);
+ else
+ M_Memcpy(skincolorsbackup, skincolors, sizeof(skincolors));
#endif
}
@@ -21716,5 +21863,13 @@ void P_ResetData(INT32 flags)
else
M_Memcpy(mobjinfo, mobjinfobackup, sizeof(mobjinfobackup));
}
+
+ if (flags & 8)
+ {
+ if (skincolorsbackupsize > 0)
+ lzf_decompress(skincolorsbackup, skincolorsbackupsize, skincolors, sizeof(skincolors));
+ else
+ M_Memcpy(skincolors, skincolorsbackup, sizeof(skincolorsbackup));
+ }
#endif
}
diff --git a/src/lua_baselib.c b/src/lua_baselib.c
index 36ea007fa471cdfb68994af25d50e4402aff598f..d460f8cf715c9667d74ed3595050d0d518c2dd41 100644
--- a/src/lua_baselib.c
+++ b/src/lua_baselib.c
@@ -27,6 +27,7 @@
#include "hu_stuff.h" // HU_AddChatText
#include "console.h"
#include "d_netcmd.h" // IsPlayerAdmin
+#include "m_menu.h" // Player Setup menu color stuff
#include "lua_script.h"
#include "lua_libs.h"
@@ -144,6 +145,8 @@ static const struct {
{META_STATE, "state_t"},
{META_MOBJINFO, "mobjinfo_t"},
{META_SFXINFO, "sfxinfo_t"},
+ {META_SKINCOLOR, "skincolor_t"},
+ {META_COLORRAMP, "skincolor_t.ramp"},
{META_SPRITEINFO, "spriteinfo_t"},
{META_PIVOTLIST, "spriteframepivot_t[]"},
{META_FRAMEPIVOT, "spriteframepivot_t"},
@@ -252,6 +255,43 @@ static int lib_reserveLuabanks(lua_State *L)
return 1;
}
+// M_MENU
+//////////////
+
+static int lib_pMoveColorBefore(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ UINT16 targ = (UINT16)luaL_checkinteger(L, 2);
+
+ NOHUD
+ M_MoveColorBefore(color, targ);
+ return 0;
+}
+
+static int lib_pMoveColorAfter(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ UINT16 targ = (UINT16)luaL_checkinteger(L, 2);
+
+ NOHUD
+ M_MoveColorAfter(color, targ);
+ return 0;
+}
+
+static int lib_pGetColorBefore(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ lua_pushinteger(L, M_GetColorBefore(color));
+ return 1;
+}
+
+static int lib_pGetColorAfter(lua_State *L)
+{
+ UINT16 color = (UINT16)luaL_checkinteger(L, 1);
+ lua_pushinteger(L, M_GetColorAfter(color));
+ return 1;
+}
+
// M_RANDOM
//////////////
@@ -2388,10 +2428,10 @@ static int lib_rGetColorByName(lua_State *L)
// SKINCOLOR_GREEN > "Green" for example
static int lib_rGetNameByColor(lua_State *L)
{
- UINT8 colornum = (UINT8)luaL_checkinteger(L, 1);
- if (!colornum || colornum >= MAXSKINCOLORS)
- return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, MAXSKINCOLORS-1);
- lua_pushstring(L, Color_Names[colornum]);
+ UINT16 colornum = (UINT16)luaL_checkinteger(L, 1);
+ if (!colornum || colornum >= numskincolors)
+ return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, numskincolors-1);
+ lua_pushstring(L, skincolors[colornum].name);
return 1;
}
@@ -3128,6 +3168,12 @@ static luaL_Reg lib[] = {
{"IsPlayerAdmin", lib_isPlayerAdmin},
{"reserveLuabanks", lib_reserveLuabanks},
+ // m_menu
+ {"M_MoveColorAfter",lib_pMoveColorAfter},
+ {"M_MoveColorBefore",lib_pMoveColorBefore},
+ {"M_GetColorAfter",lib_pGetColorAfter},
+ {"M_GetColorBefore",lib_pGetColorBefore},
+
// m_random
{"P_RandomFixed",lib_pRandomFixed},
{"P_RandomByte",lib_pRandomByte},
diff --git a/src/lua_hudlib.c b/src/lua_hudlib.c
index 703b924bb908fe7b2adfeb2fe16b453fd5b05bd0..4aa70574b3802b62b22cbc4772fb11aa216cdd61 100644
--- a/src/lua_hudlib.c
+++ b/src/lua_hudlib.c
@@ -878,8 +878,8 @@ static int libd_drawNameTag(lua_State *L)
INT32 y;
const char *str;
INT32 flags;
- UINT8 basecolor;
- UINT8 outlinecolor;
+ UINT16 basecolor;
+ UINT16 outlinecolor;
UINT8 *basecolormap = NULL;
UINT8 *outlinecolormap = NULL;
@@ -908,8 +908,8 @@ static int libd_drawScaledNameTag(lua_State *L)
const char *str;
INT32 flags;
fixed_t scale;
- UINT8 basecolor;
- UINT8 outlinecolor;
+ UINT16 basecolor;
+ UINT16 outlinecolor;
UINT8 *basecolormap = NULL;
UINT8 *outlinecolormap = NULL;
@@ -966,7 +966,7 @@ static int libd_nameTagWidth(lua_State *L)
static int libd_getColormap(lua_State *L)
{
INT32 skinnum = TC_DEFAULT;
- skincolors_t color = luaL_optinteger(L, 2, 0);
+ skincolornum_t color = luaL_optinteger(L, 2, 0);
UINT8* colormap = NULL;
HUDONLY
if (lua_isnoneornil(L, 1))
diff --git a/src/lua_infolib.c b/src/lua_infolib.c
index a82403097835cf38cb9c8c92b801c26e8724eec8..81a215c5363c96655b41782f24bb67d30aad671f 100644
--- a/src/lua_infolib.c
+++ b/src/lua_infolib.c
@@ -25,6 +25,9 @@
#include "lua_libs.h"
#include "lua_hud.h" // hud_running errors
+extern CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
+extern void R_FlushTranslationColormapCache(void);
+
boolean LUA_CallAction(const char *action, mobj_t *actor);
state_t *astate;
@@ -1465,6 +1468,229 @@ static int lib_luabankslen(lua_State *L)
return 1;
}
+////////////////////
+// SKINCOLOR INFO //
+////////////////////
+
+// Arbitrary skincolors[] table index -> skincolor_t *
+static int lib_getSkinColor(lua_State *L)
+{
+ UINT32 i;
+ lua_remove(L, 1);
+
+ i = luaL_checkinteger(L, 1);
+ if (!i || i >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (1 - %d)", i, numskincolors-1);
+ LUA_PushUserdata(L, &skincolors[i], META_SKINCOLOR);
+ return 1;
+}
+
+//Set the entire c->ramp array
+static void setRamp(lua_State *L, skincolor_t* c) {
+ UINT32 i;
+ lua_pushnil(L);
+ for (i=0; i<COLORRAMPSIZE; i++) {
+ if (lua_objlen(L,-2)<COLORRAMPSIZE) {
+ luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' must be %d entries long; got %d.", COLORRAMPSIZE, lua_objlen(L,-2));
+ break;
+ }
+ if (lua_next(L, -2) != 0) {
+ c->ramp[i] = lua_isnumber(L,-1) ? (UINT8)luaL_checkinteger(L,-1) : 120;
+ lua_pop(L, 1);
+ } else
+ c->ramp[i] = 120;
+ }
+ lua_pop(L,1);
+}
+
+// Lua table full of data -> skincolors[]
+static int lib_setSkinColor(lua_State *L)
+{
+ UINT32 j;
+ skincolor_t *info;
+ UINT16 cnum; //skincolor num
+ lua_remove(L, 1); // don't care about skincolors[] userdata.
+ {
+ cnum = (UINT16)luaL_checkinteger(L, 1);
+ if (cnum < SKINCOLOR_FIRSTFREESLOT || cnum >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (%d - %d)", cnum, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+ info = &skincolors[cnum]; // get the skincolor to assign to.
+ }
+ luaL_checktype(L, 2, LUA_TTABLE); // check that we've been passed a table.
+ lua_remove(L, 1); // pop skincolor num, don't need it any more.
+ lua_settop(L, 1); // cut the stack here. the only thing left now is the table of data we're assigning to the skincolor.
+
+ if (hud_running)
+ return luaL_error(L, "Do not alter skincolors in HUD rendering code!");
+
+ // clear the skincolor to start with, in case of missing table elements
+ memset(info,0,sizeof(skincolor_t));
+
+ Color_cons_t[cnum].value = cnum;
+ lua_pushnil(L);
+ while (lua_next(L, 1)) {
+ lua_Integer i = 0;
+ const char *str = NULL;
+ if (lua_isnumber(L, 2))
+ i = lua_tointeger(L, 2);
+ else
+ str = luaL_checkstring(L, 2);
+
+ if (i == 1 || (str && fastcmp(str,"name"))) {
+ const char* n = luaL_checkstring(L, 3);
+ strlcpy(info->name, n, MAXCOLORNAME+1);
+ if (strlen(n) > MAXCOLORNAME)
+ CONS_Alert(CONS_WARNING, "skincolor_t field 'name' ('%s') longer than %d chars; shortened to %s.\n", n, MAXCOLORNAME, info->name);
+ } else if (i == 2 || (str && fastcmp(str,"ramp"))) {
+ if (!lua_istable(L, 3) && luaL_checkudata(L, 3, META_COLORRAMP) == NULL)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' must be a table or array.");
+ else if (lua_istable(L, 3))
+ setRamp(L, info);
+ else
+ for (j=0; j<COLORRAMPSIZE; j++)
+ info->ramp[j] = (*((UINT8 **)luaL_checkudata(L, 3, META_COLORRAMP)))[j];
+ R_FlushTranslationColormapCache();
+ } else if (i == 3 || (str && fastcmp(str,"invcolor")))
+ info->invcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (i == 4 || (str && fastcmp(str,"invshade")))
+ info->invshade = (UINT8)luaL_checkinteger(L, 3)%COLORRAMPSIZE;
+ else if (i == 5 || (str && fastcmp(str,"chatcolor")))
+ info->chatcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (i == 6 || (str && fastcmp(str,"accessible"))) {
+ boolean v = lua_isboolean(L,3) ? lua_toboolean(L, 3) : true;
+ if (cnum < FIRSTSUPERCOLOR && v != skincolors[cnum].accessible)
+ return luaL_error(L, "skincolors[] index %d is a standard color; accessibility changes are prohibited.", i);
+ else
+ info->accessible = v;
+ }
+ lua_pop(L, 1);
+ }
+ return 0;
+}
+
+// #skincolors -> numskincolors
+static int lib_skincolorslen(lua_State *L)
+{
+ lua_pushinteger(L, numskincolors);
+ return 1;
+}
+
+// skincolor_t *, field -> number
+static int skincolor_get(lua_State *L)
+{
+ skincolor_t *info = *((skincolor_t **)luaL_checkudata(L, 1, META_SKINCOLOR));
+ const char *field = luaL_checkstring(L, 2);
+
+ I_Assert(info != NULL);
+ I_Assert(info >= skincolors);
+
+ if (fastcmp(field,"name"))
+ lua_pushstring(L, info->name);
+ else if (fastcmp(field,"ramp"))
+ LUA_PushUserdata(L, info->ramp, META_COLORRAMP);
+ else if (fastcmp(field,"invcolor"))
+ lua_pushinteger(L, info->invcolor);
+ else if (fastcmp(field,"invshade"))
+ lua_pushinteger(L, info->invshade);
+ else if (fastcmp(field,"chatcolor"))
+ lua_pushinteger(L, info->chatcolor);
+ else if (fastcmp(field,"accessible"))
+ lua_pushboolean(L, info->accessible);
+ else
+ CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "skincolor_t", field);
+ return 1;
+}
+
+// skincolor_t *, field, number -> skincolors[]
+static int skincolor_set(lua_State *L)
+{
+ UINT32 i;
+ skincolor_t *info = *((skincolor_t **)luaL_checkudata(L, 1, META_SKINCOLOR));
+ const char *field = luaL_checkstring(L, 2);
+
+ I_Assert(info != NULL);
+ I_Assert(info >= skincolors);
+
+ if (info-skincolors < SKINCOLOR_FIRSTFREESLOT || info-skincolors >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (%d - %d)", info-skincolors, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+
+ if (fastcmp(field,"name")) {
+ const char* n = luaL_checkstring(L, 3);
+ if (strchr(n, ' ') != NULL)
+ CONS_Alert(CONS_WARNING, "skincolor_t field 'name' ('%s') contains spaces.\n", n);
+ strlcpy(info->name, n, MAXCOLORNAME+1);
+ if (strlen(n) > MAXCOLORNAME)
+ CONS_Alert(CONS_WARNING, "skincolor_t field 'name' ('%s') longer than %d chars; clipped to %s.\n", n, MAXCOLORNAME, info->name);
+ } else if (fastcmp(field,"ramp")) {
+ if (!lua_istable(L, 3) && luaL_checkudata(L, 3, META_COLORRAMP) == NULL)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' must be a table or array.");
+ else if (lua_istable(L, 3))
+ setRamp(L, info);
+ else
+ for (i=0; i<COLORRAMPSIZE; i++)
+ info->ramp[i] = (*((UINT8 **)luaL_checkudata(L, 3, META_COLORRAMP)))[i];
+ R_FlushTranslationColormapCache();
+ } else if (fastcmp(field,"invcolor"))
+ info->invcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"invshade"))
+ info->invshade = (UINT8)luaL_checkinteger(L, 3)%COLORRAMPSIZE;
+ else if (fastcmp(field,"chatcolor"))
+ info->chatcolor = (UINT16)luaL_checkinteger(L, 3);
+ else if (fastcmp(field,"accessible"))
+ info->accessible = lua_isboolean(L,3);
+ else
+ CONS_Debug(DBG_LUA, M_GetText("'%s' has no field named '%s'; returning nil.\n"), "skincolor_t", field);
+ return 1;
+}
+
+// skincolor_t * -> SKINCOLOR_*
+static int skincolor_num(lua_State *L)
+{
+ skincolor_t *info = *((skincolor_t **)luaL_checkudata(L, 1, META_SKINCOLOR));
+
+ I_Assert(info != NULL);
+ I_Assert(info >= skincolors);
+
+ lua_pushinteger(L, info-skincolors);
+ return 1;
+}
+
+// ramp, n -> ramp[n]
+static int colorramp_get(lua_State *L)
+{
+ UINT8 *colorramp = *((UINT8 **)luaL_checkudata(L, 1, META_COLORRAMP));
+ UINT32 n = luaL_checkinteger(L, 2);
+ if (n >= COLORRAMPSIZE)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' index %d out of range (0 - %d)", n, COLORRAMPSIZE-1);
+ lua_pushinteger(L, colorramp[n]);
+ return 1;
+}
+
+// ramp, n, value -> ramp[n] = value
+static int colorramp_set(lua_State *L)
+{
+ UINT8 *colorramp = *((UINT8 **)luaL_checkudata(L, 1, META_COLORRAMP));
+ UINT16 cnum = (UINT16)(((uint8_t*)colorramp - (uint8_t*)(skincolors[0].ramp))/sizeof(skincolor_t));
+ UINT32 n = luaL_checkinteger(L, 2);
+ UINT8 i = (UINT8)luaL_checkinteger(L, 3);
+ if (cnum < SKINCOLOR_FIRSTFREESLOT || cnum >= numskincolors)
+ return luaL_error(L, "skincolors[] index %d out of range (%d - %d)", cnum, SKINCOLOR_FIRSTFREESLOT, numskincolors-1);
+ if (n >= COLORRAMPSIZE)
+ return luaL_error(L, LUA_QL("skincolor_t") " field 'ramp' index %d out of range (0 - %d)", n, COLORRAMPSIZE-1);
+ if (hud_running)
+ return luaL_error(L, "Do not alter skincolor_t in HUD rendering code!");
+ colorramp[n] = i;
+ R_FlushTranslationColormapCache();
+ return 0;
+}
+
+// #ramp -> COLORRAMPSIZE
+static int colorramp_len(lua_State *L)
+{
+ lua_pushinteger(L, COLORRAMPSIZE);
+ return 1;
+}
+
//////////////////////////////
//
// Now push all these functions into the Lua state!
@@ -1502,6 +1728,28 @@ int LUA_InfoLib(lua_State *L)
lua_setfield(L, -2, "__len");
lua_pop(L, 1);
+ luaL_newmetatable(L, META_SKINCOLOR);
+ lua_pushcfunction(L, skincolor_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, skincolor_set);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, skincolor_num);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L, 1);
+
+ luaL_newmetatable(L, META_COLORRAMP);
+ lua_pushcfunction(L, colorramp_get);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, colorramp_set);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, colorramp_len);
+ lua_setfield(L, -2, "__len");
+ lua_pop(L,1);
+
luaL_newmetatable(L, META_SFXINFO);
lua_pushcfunction(L, sfxinfo_get);
lua_setfield(L, -2, "__index");
@@ -1605,6 +1853,19 @@ int LUA_InfoLib(lua_State *L)
lua_setmetatable(L, -2);
lua_setglobal(L, "mobjinfo");
+ lua_newuserdata(L, 0);
+ lua_createtable(L, 0, 2);
+ lua_pushcfunction(L, lib_getSkinColor);
+ lua_setfield(L, -2, "__index");
+
+ lua_pushcfunction(L, lib_setSkinColor);
+ lua_setfield(L, -2, "__newindex");
+
+ lua_pushcfunction(L, lib_skincolorslen);
+ lua_setfield(L, -2, "__len");
+ lua_setmetatable(L, -2);
+ lua_setglobal(L, "skincolors");
+
lua_newuserdata(L, 0);
lua_createtable(L, 0, 2);
lua_pushcfunction(L, lib_getSfxInfo);
diff --git a/src/lua_libs.h b/src/lua_libs.h
index d0334d7255e0cbf8393211ccb4444251d0225cec..a78128e9f88bed6d1b2c99677fabc6f665ab753c 100644
--- a/src/lua_libs.h
+++ b/src/lua_libs.h
@@ -20,6 +20,8 @@ extern lua_State *gL;
#define META_STATE "STATE_T*"
#define META_MOBJINFO "MOBJINFO_T*"
#define META_SFXINFO "SFXINFO_T*"
+#define META_SKINCOLOR "SKINCOLOR_T*"
+#define META_COLORRAMP "SKINCOLOR_T*RAMP"
#define META_SPRITEINFO "SPRITEINFO_T*"
#define META_PIVOTLIST "SPRITEFRAMEPIVOT_T[]"
#define META_FRAMEPIVOT "SPRITEFRAMEPIVOT_T*"
diff --git a/src/lua_mathlib.c b/src/lua_mathlib.c
index 215903278107416bed4d740d644cdc27a1b120f2..76c80c541314a2914ccff349f41928bf4dcd7b9a 100644
--- a/src/lua_mathlib.c
+++ b/src/lua_mathlib.c
@@ -172,15 +172,14 @@ static int lib_all7emeralds(lua_State *L)
return 1;
}
-// Whee, special Lua-exclusive function for making use of Color_Opposite[]
// Returns both color and signpost shade numbers!
static int lib_coloropposite(lua_State *L)
{
- UINT8 colornum = (UINT8)luaL_checkinteger(L, 1);
- if (!colornum || colornum >= MAXSKINCOLORS)
- return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, MAXSKINCOLORS-1);
- lua_pushinteger(L, Color_Opposite[colornum-1][0]); // push color
- lua_pushinteger(L, Color_Opposite[colornum-1][1]); // push sign shade index, 0-15
+ UINT16 colornum = (UINT16)luaL_checkinteger(L, 1);
+ if (!colornum || colornum >= numskincolors)
+ return luaL_error(L, "skincolor %d out of range (1 - %d).", colornum, numskincolors-1);
+ lua_pushinteger(L, skincolors[colornum].invcolor); // push color
+ lua_pushinteger(L, skincolors[colornum].invshade); // push sign shade index, 0-15
return 2;
}
diff --git a/src/lua_mobjlib.c b/src/lua_mobjlib.c
index ac1432b4cc02ab35d2b84faa3889524cdd25ff98..3ca3ca1d7c1293bfb9bc8ba3fddcedb56cc922a5 100644
--- a/src/lua_mobjlib.c
+++ b/src/lua_mobjlib.c
@@ -574,9 +574,9 @@ static int mobj_set(lua_State *L)
}
case mobj_color:
{
- UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
- if (newcolor >= MAXTRANSLATIONS)
- return luaL_error(L, "mobj.color %d out of range (0 - %d).", newcolor, MAXTRANSLATIONS-1);
+ UINT16 newcolor = (UINT16)luaL_checkinteger(L,3);
+ if (newcolor >= numskincolors)
+ return luaL_error(L, "mobj.color %d out of range (0 - %d).", newcolor, numskincolors-1);
mo->color = newcolor;
break;
}
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index cdece1fb79ebf9fb27eb553f6cf45ac252655973..1ce9be525f50146735f3973bb5b36de246c5b383 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -461,9 +461,9 @@ static int player_set(lua_State *L)
plr->flashpal = (UINT16)luaL_checkinteger(L, 3);
else if (fastcmp(field,"skincolor"))
{
- UINT8 newcolor = (UINT8)luaL_checkinteger(L,3);
- if (newcolor >= MAXSKINCOLORS)
- return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, MAXSKINCOLORS-1);
+ UINT16 newcolor = (UINT16)luaL_checkinteger(L,3);
+ if (newcolor >= numskincolors)
+ return luaL_error(L, "player.skincolor %d out of range (0 - %d).", newcolor, numskincolors-1);
plr->skincolor = newcolor;
}
else if (fastcmp(field,"score"))
diff --git a/src/lua_script.c b/src/lua_script.c
index d2069e8a72f1f370c36b086482c2c68d8c529705..4f94b007eca31f8bda5bf383d960c613a43cd6fa 100644
--- a/src/lua_script.c
+++ b/src/lua_script.c
@@ -756,6 +756,7 @@ enum
ARCH_FFLOOR,
ARCH_SLOPE,
ARCH_MAPHEADER,
+ ARCH_SKINCOLOR,
ARCH_TEND=0xFF,
};
@@ -781,6 +782,7 @@ static const struct {
{META_FFLOOR, ARCH_FFLOOR},
{META_SLOPE, ARCH_SLOPE},
{META_MAPHEADER, ARCH_MAPHEADER},
+ {META_SKINCOLOR, ARCH_SKINCOLOR},
{NULL, ARCH_NULL}
};
@@ -1068,6 +1070,14 @@ static UINT8 ArchiveValue(int TABLESINDEX, int myindex)
}
break;
}
+
+ case ARCH_SKINCOLOR:
+ {
+ skincolor_t *info = *((skincolor_t **)lua_touserdata(gL, myindex));
+ WRITEUINT8(save_p, ARCH_SKINCOLOR);
+ WRITEUINT16(save_p, info - skincolors);
+ break;
+ }
default:
WRITEUINT8(save_p, ARCH_NULL);
return 2;
@@ -1299,6 +1309,9 @@ static UINT8 UnArchiveValue(int TABLESINDEX)
case ARCH_MAPHEADER:
LUA_PushUserdata(gL, mapheaderinfo[READUINT16(save_p)], META_MAPHEADER);
break;
+ case ARCH_SKINCOLOR:
+ LUA_PushUserdata(gL, &skincolors[READUINT16(save_p)], META_SKINCOLOR);
+ break;
case ARCH_TEND:
return 1;
}
diff --git a/src/m_cheat.c b/src/m_cheat.c
index 156c5db16bbc7d92a4a89151d1c8b05344ef27f8..3d188644b0226e16464fc5a603fee7c036ab6ab1 100644
--- a/src/m_cheat.c
+++ b/src/m_cheat.c
@@ -978,7 +978,7 @@ static mobjflag2_t op_oldflags2 = 0;
static UINT32 op_oldeflags = 0;
static fixed_t op_oldmomx = 0, op_oldmomy = 0, op_oldmomz = 0, op_oldheight = 0;
static statenum_t op_oldstate = 0;
-static UINT8 op_oldcolor = 0;
+static UINT16 op_oldcolor = 0;
//
// Static calculation / common output help
diff --git a/src/m_cond.c b/src/m_cond.c
index 0abc7adf88c7ace2907b69ea4c8277a500549b99..36fcd7cf295aff241e7637d906381422121bd60a 100644
--- a/src/m_cond.c
+++ b/src/m_cond.c
@@ -523,9 +523,9 @@ emblem_t *M_GetLevelEmblems(INT32 mapnum)
return NULL;
}
-skincolors_t M_GetEmblemColor(emblem_t *em)
+skincolornum_t M_GetEmblemColor(emblem_t *em)
{
- if (!em || em->color >= MAXSKINCOLORS)
+ if (!em || em->color >= numskincolors)
return SKINCOLOR_NONE;
return em->color;
}
@@ -549,9 +549,9 @@ const char *M_GetEmblemPatch(emblem_t *em, boolean big)
return pnamebuf;
}
-skincolors_t M_GetExtraEmblemColor(extraemblem_t *em)
+skincolornum_t M_GetExtraEmblemColor(extraemblem_t *em)
{
- if (!em || em->color >= MAXSKINCOLORS)
+ if (!em || em->color >= numskincolors)
return SKINCOLOR_NONE;
return em->color;
}
diff --git a/src/m_cond.h b/src/m_cond.h
index d7b9704dd94bb4c5793302ff6204ae061d5007f0..9bb162ff317a34f40d69cc1ec37230e1d818af27 100644
--- a/src/m_cond.h
+++ b/src/m_cond.h
@@ -90,7 +90,7 @@ typedef struct
INT16 tag; ///< Tag of emblem mapthing
INT16 level; ///< Level on which this emblem can be found.
UINT8 sprite; ///< emblem sprite to use, 0 - 25
- UINT8 color; ///< skincolor to use
+ UINT16 color; ///< skincolor to use
INT32 var; ///< If needed, specifies information on the target amount to achieve (or target skin)
char hint[110]; ///< Hint for emblem hints menu
UINT8 collected; ///< Do you have this emblem?
@@ -102,7 +102,7 @@ typedef struct
UINT8 conditionset; ///< Condition set that awards this emblem.
UINT8 showconditionset; ///< Condition set that shows this emblem.
UINT8 sprite; ///< emblem sprite to use, 0 - 25
- UINT8 color; ///< skincolor to use
+ UINT16 color; ///< skincolor to use
UINT8 collected; ///< Do you have this emblem?
} extraemblem_t;
@@ -172,9 +172,9 @@ INT32 M_CountEmblems(void);
// Emblem shit
emblem_t *M_GetLevelEmblems(INT32 mapnum);
-skincolors_t M_GetEmblemColor(emblem_t *em);
+skincolornum_t M_GetEmblemColor(emblem_t *em);
const char *M_GetEmblemPatch(emblem_t *em, boolean big);
-skincolors_t M_GetExtraEmblemColor(extraemblem_t *em);
+skincolornum_t M_GetExtraEmblemColor(extraemblem_t *em);
const char *M_GetExtraEmblemPatch(extraemblem_t *em, boolean big);
// If you're looking to compare stats for unlocks or what not, use these
diff --git a/src/m_menu.c b/src/m_menu.c
index 175dc1c2229f1cbddda69a1795e43a16a9840bb4..f9061b2513259639aad55948a90904037a2f825f 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -7545,7 +7545,7 @@ static void M_DrawSoundTest(void)
{
frame[1] = (2-st_time);
frame[2] = ((cv_soundtest.value - 1) % 9);
- frame[3] += (((cv_soundtest.value - 1) / 9) % (MAXSKINCOLORS - frame[3]));
+ frame[3] += (((cv_soundtest.value - 1) / 9) % (FIRSTSUPERCOLOR - frame[3]));
if (st_time < 2)
st_time++;
}
@@ -8213,13 +8213,13 @@ static void M_DrawLoadGameData(void)
{
if (charskin->prefoppositecolor)
{
- col = charskin->prefoppositecolor - 1;
- col = Color_Index[col][Color_Opposite[Color_Opposite[col][0] - 1][1]];
+ col = charskin->prefoppositecolor;
+ col = skincolors[col].ramp[skincolors[skincolors[col].invcolor].invshade];
}
else
{
- col = charskin->prefcolor - 1;
- col = Color_Index[Color_Opposite[col][0]-1][Color_Opposite[col][1]];
+ col = charskin->prefcolor;
+ col = skincolors[skincolors[col].invcolor].ramp[skincolors[col].invshade];
}
}
@@ -9055,7 +9055,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
skin_t *charskin = &skins[0];
INT32 skinnum = 0;
- UINT8 col;
+ UINT16 col;
UINT8 *colormap = NULL;
INT32 prev = -1, next = -1;
@@ -9094,7 +9094,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
// Use the opposite of the character's skincolor
col = description[char_on].oppositecolor;
if (!col)
- col = Color_Opposite[charskin->prefcolor - 1][0];
+ col = skincolors[charskin->prefcolor].invcolor;
// Make the translation colormap
colormap = R_GetTranslationColormap(TC_DEFAULT, col, GTC_CACHE);
@@ -9145,8 +9145,8 @@ static void M_DrawSetupChoosePlayerMenu(void)
INT32 ox, oxsh = FixedInt(FixedMul(BASEVIDWIDTH*FRACUNIT, FixedDiv(char_scroll, 128*FRACUNIT))), txsh;
patch_t *curpatch = NULL, *prevpatch = NULL, *nextpatch = NULL;
const char *curtext = NULL, *prevtext = NULL, *nexttext = NULL;
- UINT8 curtextcolor = 0, prevtextcolor = 0, nexttextcolor = 0;
- UINT8 curoutlinecolor = 0, prevoutlinecolor = 0, nextoutlinecolor = 0;
+ UINT16 curtextcolor = 0, prevtextcolor = 0, nexttextcolor = 0;
+ UINT16 curoutlinecolor = 0, prevoutlinecolor = 0, nextoutlinecolor = 0;
// Name tag
curtext = description[char_on].displayname;
@@ -9157,7 +9157,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
if (!curtextcolor)
curtextcolor = charskin->prefcolor;
if (!curoutlinecolor)
- curoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+ curoutlinecolor = col = skincolors[charskin->prefcolor].invcolor;
txsh = oxsh;
ox = 8 + SHORT((description[char_on].charpic)->width)/2;
@@ -9196,7 +9196,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
if (!prevtextcolor)
prevtextcolor = charskin->prefcolor;
if (!prevoutlinecolor)
- prevoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+ prevoutlinecolor = col = skincolors[charskin->prefcolor].invcolor;
x = (ox - txsh) - w;
if (prevpatch)
@@ -9226,7 +9226,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
if (!nexttextcolor)
nexttextcolor = charskin->prefcolor;
if (!nextoutlinecolor)
- nextoutlinecolor = Color_Opposite[charskin->prefcolor - 1][0];
+ nextoutlinecolor = col = skincolors[charskin->prefcolor].invcolor;
x = (ox - txsh) + w;
if (nextpatch)
@@ -11076,15 +11076,15 @@ static UINT8 multi_spr2;
// this is set before entering the MultiPlayer setup menu,
// for either player 1 or 2
-static char setupm_name[MAXPLAYERNAME+1];
-static player_t *setupm_player;
-static consvar_t *setupm_cvskin;
-static consvar_t *setupm_cvcolor;
-static consvar_t *setupm_cvname;
-static consvar_t *setupm_cvdefaultskin;
-static consvar_t *setupm_cvdefaultcolor;
-static INT32 setupm_fakeskin;
-static INT32 setupm_fakecolor;
+static char setupm_name[MAXPLAYERNAME+1];
+static player_t *setupm_player;
+static consvar_t *setupm_cvskin;
+static consvar_t *setupm_cvcolor;
+static consvar_t *setupm_cvname;
+static consvar_t *setupm_cvdefaultskin;
+static consvar_t *setupm_cvdefaultcolor;
+static INT32 setupm_fakeskin;
+static menucolor_t *setupm_fakecolor;
static void M_DrawSetupMultiPlayerMenu(void)
{
@@ -11151,11 +11151,11 @@ static void M_DrawSetupMultiPlayerMenu(void)
sprdef = &skins[setupm_fakeskin].sprites[multi_spr2];
- if (!setupm_fakecolor || !sprdef->numframes) // should never happen but hey, who knows
+ if (!setupm_fakecolor->color || !sprdef->numframes) // should never happen but hey, who knows
goto faildraw;
// ok, draw player sprite for sure now
- colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor, 0);
+ colormap = R_GetTranslationColormap(setupm_fakeskin, setupm_fakecolor->color, 0);
if (multi_frame >= sprdef->numframes)
multi_frame = 0;
@@ -11201,11 +11201,11 @@ colordraw:
// draw color string
V_DrawRightAlignedString(BASEVIDWIDTH - x, y,
((MP_PlayerSetupMenu[2].status & IT_TYPE) == IT_SPACE ? V_TRANSLUCENT : 0)|(itemOn == 2 ? V_YELLOWMAP : 0)|V_ALLOWLOWERCASE,
- Color_Names[setupm_fakecolor]);
+ skincolors[setupm_fakecolor->color].name);
if (itemOn == 2 && (MP_PlayerSetupMenu[2].status & IT_TYPE) != IT_SPACE)
{
- V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(Color_Names[setupm_fakecolor], V_ALLOWLOWERCASE) - (skullAnimCounter/5), y,
+ V_DrawCharacter(BASEVIDWIDTH - x - 10 - V_StringWidth(skincolors[setupm_fakecolor->color].name, V_ALLOWLOWERCASE) - (skullAnimCounter/5), y,
'\x1C' | V_YELLOWMAP, false);
V_DrawCharacter(BASEVIDWIDTH - x + 2 + (skullAnimCounter/5), y,
'\x1D' | V_YELLOWMAP, false);
@@ -11215,25 +11215,39 @@ colordraw:
#define indexwidth 8
{
- const INT32 colwidth = (282-charw)/(2*indexwidth);
- INT32 i = -colwidth;
- INT16 col = setupm_fakecolor - colwidth;
- INT32 w = indexwidth;
+ const INT32 numcolors = (282-charw)/(2*indexwidth); // Number of colors per side
+ INT32 w = indexwidth; // Width of a singular color block
+ menucolor_t *mc = setupm_fakecolor->prev; // Last accessed color
UINT8 h;
+ INT16 i;
+
+ // Draw color in the middle
+ x += numcolors*w;
+ for (h = 0; h < 16; h++)
+ V_DrawFill(x, y+h, charw, 1, skincolors[setupm_fakecolor->color].ramp[h]);
+
+ //Draw colors from middle to left
+ for (i=0; i<numcolors; i++) {
+ x -= w;
+ // Find accessible color before this one
+ while (!skincolors[mc->color].accessible)
+ mc = mc->prev;
+ for (h = 0; h < 16; h++)
+ V_DrawFill(x, y+h, w, 1, skincolors[mc->color].ramp[h]);
+ mc = mc->prev;
+ }
- while (col < 1)
- col += MAXSKINCOLORS-1;
- while (i <= colwidth)
- {
- if (!(i++))
- w = charw;
- else
- w = indexwidth;
+ // Draw colors from middle to right
+ mc = setupm_fakecolor->next;
+ x += numcolors*w + charw;
+ for (i=0; i<numcolors; i++) {
+ // Find accessible color after this one
+ while (!skincolors[mc->color].accessible)
+ mc = mc->next;
for (h = 0; h < 16; h++)
- V_DrawFill(x, y+h, w, 1, Color_Index[col-1][h]);
- if (++col >= MAXSKINCOLORS)
- col -= MAXSKINCOLORS-1;
+ V_DrawFill(x, y+h, w, 1, skincolors[mc->color].ramp[h]);
x += w;
+ mc = mc->next;
}
}
#undef charw
@@ -11244,7 +11258,7 @@ colordraw:
V_DrawString(x, y,
((R_SkinAvailable(setupm_cvdefaultskin->string) != setupm_fakeskin
- || setupm_cvdefaultcolor->value != setupm_fakecolor)
+ || setupm_cvdefaultcolor->value != setupm_fakecolor->color)
? 0
: V_TRANSLUCENT)
| ((itemOn == 3) ? V_YELLOWMAP : 0),
@@ -11292,19 +11306,19 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
else if (itemOn == 2) // player color
{
S_StartSound(NULL,sfx_menu1); // Tails
- setupm_fakecolor--;
+ setupm_fakecolor = setupm_fakecolor->prev;
}
break;
case KEY_ENTER:
if (itemOn == 3
&& (R_SkinAvailable(setupm_cvdefaultskin->string) != setupm_fakeskin
- || setupm_cvdefaultcolor->value != setupm_fakecolor))
+ || setupm_cvdefaultcolor->value != setupm_fakecolor->color))
{
S_StartSound(NULL,sfx_strpst);
// you know what? always putting these in the buffer won't hurt anything.
COM_BufAddText (va("%s \"%s\"\n",setupm_cvdefaultskin->name,skins[setupm_fakeskin].name));
- COM_BufAddText (va("%s %d\n",setupm_cvdefaultcolor->name,setupm_fakecolor));
+ COM_BufAddText (va("%s %d\n",setupm_cvdefaultcolor->name,setupm_fakecolor->color));
break;
}
/* FALLTHRU */
@@ -11325,7 +11339,7 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
else if (itemOn == 2) // player color
{
S_StartSound(NULL,sfx_menu1); // Tails
- setupm_fakecolor++;
+ setupm_fakecolor = setupm_fakecolor->next;
}
break;
@@ -11341,11 +11355,13 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
}
else if (itemOn == 2)
{
- UINT8 col = skins[setupm_fakeskin].prefcolor;
- if (setupm_fakecolor != col)
+ UINT16 col = skins[setupm_fakeskin].prefcolor;
+ if ((setupm_fakecolor->color != col) && skincolors[col].accessible)
{
S_StartSound(NULL,sfx_menu1); // Tails
- setupm_fakecolor = col;
+ for (setupm_fakecolor=menucolorhead;;setupm_fakecolor=setupm_fakecolor->next)
+ if (setupm_fakecolor->color == col || setupm_fakecolor == menucolortail)
+ break;
}
}
break;
@@ -11373,10 +11389,14 @@ static void M_HandleSetupMultiPlayer(INT32 choice)
}
// check color
- if (setupm_fakecolor < 1)
- setupm_fakecolor = MAXSKINCOLORS-1;
- if (setupm_fakecolor > MAXSKINCOLORS-1)
- setupm_fakecolor = 1;
+ if (itemOn == 2 && !skincolors[setupm_fakecolor->color].accessible) {
+ if (choice == KEY_LEFTARROW)
+ while (!skincolors[setupm_fakecolor->color].accessible)
+ setupm_fakecolor = setupm_fakecolor->prev;
+ else if (choice == KEY_RIGHTARROW || choice == KEY_ENTER)
+ while (!skincolors[setupm_fakecolor->color].accessible)
+ setupm_fakecolor = setupm_fakecolor->next;
+ }
if (exitmenu)
{
@@ -11408,7 +11428,10 @@ static void M_SetupMultiPlayer(INT32 choice)
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
- setupm_fakecolor = setupm_cvcolor->value;
+
+ for (setupm_fakecolor=menucolorhead;;setupm_fakecolor=setupm_fakecolor->next)
+ if (setupm_fakecolor->color == setupm_cvcolor->value || setupm_fakecolor == menucolortail)
+ break;
// disable skin changes if we can't actually change skins
if (!CanChangeSkin(consoleplayer))
@@ -11449,7 +11472,10 @@ static void M_SetupMultiPlayer2(INT32 choice)
setupm_fakeskin = R_SkinAvailable(setupm_cvskin->string);
if (setupm_fakeskin == -1)
setupm_fakeskin = 0;
- setupm_fakecolor = setupm_cvcolor->value;
+
+ for (setupm_fakecolor=menucolorhead;;setupm_fakecolor=setupm_fakecolor->next)
+ if (setupm_fakecolor->color == setupm_cvcolor->value || setupm_fakecolor == menucolortail)
+ break;
// disable skin changes if we can't actually change skins
if (splitscreen && !CanChangeSkin(secondarydisplayplayer))
@@ -11481,12 +11507,181 @@ static boolean M_QuitMultiPlayerMenu(void)
setupm_name[l] =0;
COM_BufAddText (va("%s \"%s\"\n",setupm_cvname->name,setupm_name));
}
- // you know what? always putting these in the buffer won't hurt anything.
COM_BufAddText (va("%s \"%s\"\n",setupm_cvskin->name,skins[setupm_fakeskin].name));
- COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor));
+ // send color if changed
+ if (setupm_fakecolor->color != setupm_cvcolor->value)
+ COM_BufAddText (va("%s %d\n",setupm_cvcolor->name,setupm_fakecolor->color));
return true;
}
+void M_AddMenuColor(UINT16 color) {
+ menucolor_t *c;
+
+ if (color >= numskincolors) {
+ CONS_Printf("M_AddMenuColor: color %d does not exist.",color);
+ return;
+ }
+
+ c = (menucolor_t *)malloc(sizeof(menucolor_t));
+ c->color = color;
+ if (menucolorhead == NULL) {
+ c->next = c;
+ c->prev = c;
+ menucolorhead = c;
+ menucolortail = c;
+ } else {
+ c->next = menucolorhead;
+ c->prev = menucolortail;
+ menucolortail->next = c;
+ menucolorhead->prev = c;
+ menucolortail = c;
+ }
+}
+
+void M_MoveColorBefore(UINT16 color, UINT16 targ) {
+ menucolor_t *look, *c = NULL, *t = NULL;
+
+ if (color == targ)
+ return;
+ if (color >= numskincolors) {
+ CONS_Printf("M_MoveColorBefore: color %d does not exist.",color);
+ return;
+ }
+ if (targ >= numskincolors) {
+ CONS_Printf("M_MoveColorBefore: target color %d does not exist.",targ);
+ return;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ c = look;
+ else if (look->color == targ)
+ t = look;
+ if (c != NULL && t != NULL)
+ break;
+ if (look==menucolortail)
+ return;
+ }
+
+ if (c == t->prev)
+ return;
+
+ if (t==menucolorhead)
+ menucolorhead = c;
+ if (c==menucolortail)
+ menucolortail = c->prev;
+
+ c->prev->next = c->next;
+ c->next->prev = c->prev;
+
+ c->prev = t->prev;
+ c->next = t;
+ t->prev->next = c;
+ t->prev = c;
+}
+
+void M_MoveColorAfter(UINT16 color, UINT16 targ) {
+ menucolor_t *look, *c = NULL, *t = NULL;
+
+ if (color == targ)
+ return;
+ if (color >= numskincolors) {
+ CONS_Printf("M_MoveColorAfter: color %d does not exist.\n",color);
+ return;
+ }
+ if (targ >= numskincolors) {
+ CONS_Printf("M_MoveColorAfter: target color %d does not exist.\n",targ);
+ return;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ c = look;
+ else if (look->color == targ)
+ t = look;
+ if (c != NULL && t != NULL)
+ break;
+ if (look==menucolortail)
+ return;
+ }
+
+ if (t == c->prev)
+ return;
+
+ if (t==menucolortail)
+ menucolortail = c;
+ else if (c==menucolortail)
+ menucolortail = c->prev;
+
+ c->prev->next = c->next;
+ c->next->prev = c->prev;
+
+ c->next = t->next;
+ c->prev = t;
+ t->next->prev = c;
+ t->next = c;
+}
+
+UINT16 M_GetColorBefore(UINT16 color) {
+ menucolor_t *look;
+
+ if (color >= numskincolors) {
+ CONS_Printf("M_GetColorBefore: color %d does not exist.\n",color);
+ return 0;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ return look->prev->color;
+ if (look==menucolortail)
+ return 0;
+ }
+}
+
+UINT16 M_GetColorAfter(UINT16 color) {
+ menucolor_t *look;
+
+ if (color >= numskincolors) {
+ CONS_Printf("M_GetColorAfter: color %d does not exist.\n",color);
+ return 0;
+ }
+
+ for (look=menucolorhead;;look=look->next) {
+ if (look->color == color)
+ return look->next->color;
+ if (look==menucolortail)
+ return 0;
+ }
+}
+
+void M_InitPlayerSetupColors(void) {
+ UINT8 i;
+ numskincolors = SKINCOLOR_FIRSTFREESLOT;
+ menucolorhead = menucolortail = NULL;
+ for (i=0; i<numskincolors; i++)
+ M_AddMenuColor(i);
+}
+
+void M_FreePlayerSetupColors(void) {
+ menucolor_t *look = menucolorhead, *tmp;
+
+ if (menucolorhead==NULL)
+ return;
+
+ while (true) {
+ if (look != menucolortail) {
+ tmp = look;
+ look = look->next;
+ free(tmp);
+ } else {
+ free(look);
+ return;
+ }
+ }
+
+ menucolorhead = menucolortail = NULL;
+}
+
// =================
// DATA OPTIONS MENU
// =================
diff --git a/src/m_menu.h b/src/m_menu.h
index 565b98945718e9612a47da82e1d306fa64a54845..240c4b2359d1f8592f1f69a978f449603b05e256 100644
--- a/src/m_menu.h
+++ b/src/m_menu.h
@@ -355,11 +355,11 @@ typedef struct
// new character select
char displayname[SKINNAMESIZE+1];
SINT8 skinnum[2];
- UINT8 oppositecolor;
+ UINT16 oppositecolor;
char nametag[8];
patch_t *namepic;
- UINT8 tagtextcolor;
- UINT8 tagoutlinecolor;
+ UINT16 tagtextcolor;
+ UINT16 tagoutlinecolor;
} description_t;
// level select platter
@@ -443,6 +443,23 @@ void Addons_option_Onchange(void);
// Moviemode menu updating
void Moviemode_option_Onchange(void);
+// Player Setup menu colors linked list
+typedef struct menucolor_s {
+ struct menucolor_s *next;
+ struct menucolor_s *prev;
+ UINT16 color;
+} menucolor_t;
+
+menucolor_t *menucolorhead, *menucolortail;
+
+void M_AddMenuColor(UINT16 color);
+void M_MoveColorBefore(UINT16 color, UINT16 targ);
+void M_MoveColorAfter(UINT16 color, UINT16 targ);
+UINT16 M_GetColorBefore(UINT16 color);
+UINT16 M_GetColorAfter(UINT16 color);
+void M_InitPlayerSetupColors(void);
+void M_FreePlayerSetupColors(void);
+
// These defines make it a little easier to make menus
#define DEFAULTMENUSTYLE(id, header, source, prev, x, y)\
{\
diff --git a/src/p_enemy.c b/src/p_enemy.c
index bd8a2b054650f93254f4cfe1c3ef8dbc6cf01c75..75d32c50616da692ed88c94a7e736126823f4f77 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -5106,13 +5106,13 @@ void A_SignPlayer(mobj_t *actor)
INT32 locvar2 = var2;
skin_t *skin = NULL;
mobj_t *ov;
- UINT8 facecolor, signcolor = (UINT8)locvar2;
+ UINT16 facecolor, signcolor = (UINT16)locvar2;
UINT32 signframe = states[actor->info->raisestate].frame;
if (LUA_CallAction("A_SignPlayer", actor))
return;
- if (actor->tracer == NULL || locvar1 < -3 || locvar1 >= numskins || signcolor >= MAXTRANSLATIONS)
+ if (actor->tracer == NULL || locvar1 < -3 || locvar1 >= numskins || signcolor >= numskincolors)
return;
// if no face overlay, spawn one
@@ -5143,7 +5143,7 @@ void A_SignPlayer(mobj_t *actor)
else if ((actor->target->player->skincolor == skin->prefcolor) && (skin->prefoppositecolor)) // Set it as the skin's preferred oppositecolor?
signcolor = skin->prefoppositecolor;
else if (actor->target->player->skincolor) // Set the sign to be an appropriate background color for this player's skincolor.
- signcolor = Color_Opposite[actor->target->player->skincolor - 1][0];
+ signcolor = skincolors[actor->target->player->skincolor].invcolor;
else
signcolor = SKINCOLOR_NONE;
}
@@ -5181,7 +5181,7 @@ void A_SignPlayer(mobj_t *actor)
else if (skin->prefoppositecolor)
signcolor = skin->prefoppositecolor;
else if (facecolor)
- signcolor = Color_Opposite[facecolor - 1][0];
+ signcolor = skincolors[facecolor].invcolor;
}
if (skin)
@@ -5212,19 +5212,8 @@ void A_SignPlayer(mobj_t *actor)
}
actor->tracer->color = signcolor;
- /*
- If you're here from the comment above Color_Opposite,
- the following line is the one which is dependent on the
- array being symmetrical. It gets the opposite of the
- opposite of your desired colour just so it can get the
- brightness frame for the End Sign. It's not a great
- design choice, but it's constant time array access and
- the idea that the colours should be OPPOSITES is kind
- of in the name. If you have a better idea, feel free
- to let me know. ~toast 2016/07/20
- */
- if (signcolor && signcolor < MAXSKINCOLORS)
- signframe += (15 - Color_Opposite[Color_Opposite[signcolor - 1][0] - 1][1]);
+ if (signcolor && signcolor < numskincolors)
+ signframe += (15 - skincolors[signcolor].invshade);
actor->tracer->frame = signframe;
}
@@ -8804,10 +8793,10 @@ void A_ChangeColorRelative(mobj_t *actor)
{
// Have you ever seen anything so hideous?
if (actor->target)
- actor->color = (UINT8)(actor->color + actor->target->color);
+ actor->color = (UINT16)(actor->color + actor->target->color);
}
else
- actor->color = (UINT8)(actor->color + locvar2);
+ actor->color = (UINT16)(actor->color + locvar2);
}
// Function: A_ChangeColorAbsolute
@@ -8831,7 +8820,7 @@ void A_ChangeColorAbsolute(mobj_t *actor)
actor->color = actor->target->color;
}
else
- actor->color = (UINT8)locvar2;
+ actor->color = (UINT16)locvar2;
}
// Function: A_Dye
@@ -8850,7 +8839,7 @@ void A_Dye(mobj_t *actor)
UINT8 color = (UINT8)locvar2;
if (LUA_CallAction("A_Dye", actor))
return;
- if (color >= MAXTRANSLATIONS)
+ if (color >= numskincolors)
return;
if (!color)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 4124c47a9f954b8faf4c54189bc63f5d9b9dc176..fd13c8f05be07c1e9440b979ab9656c81ec6b4d0 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -436,7 +436,7 @@ boolean P_SetPlayerMobjState(mobj_t *mobj, statenum_t state)
mobj->sprite2 = spr2;
mobj->frame = frame|(st->frame&~FF_FRAMEMASK);
- if (mobj->color >= MAXSKINCOLORS && mobj->color < MAXTRANSLATIONS) // Super colours? Super bright!
+ if (mobj->color >= FIRSTSUPERCOLOR && mobj->color < numskincolors) // Super colours? Super bright!
mobj->frame |= FF_FULLBRIGHT;
}
// Regular sprites
@@ -9429,7 +9429,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
case MT_BOSSFLYPOINT:
return false;
case MT_NIGHTSCORE:
- mobj->color = (UINT8)(leveltime % SKINCOLOR_WHITE);
+ mobj->color = (UINT16)(leveltime % SKINCOLOR_WHITE);
break;
case MT_JETFUME1:
if (!P_JetFume1Think(mobj))
@@ -10636,7 +10636,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
break;
case MT_EGGROBO1:
mobj->movecount = P_RandomKey(13);
- mobj->color = SKINCOLOR_RUBY + P_RandomKey(MAXSKINCOLORS - SKINCOLOR_RUBY);
+ mobj->color = SKINCOLOR_RUBY + P_RandomKey(numskincolors - SKINCOLOR_RUBY);
break;
case MT_HIVEELEMENTAL:
mobj->extravalue1 = 5;
@@ -11916,7 +11916,7 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
{
INT32 j;
emblem_t* emblem = M_GetLevelEmblems(gamemap);
- skincolors_t emcolor;
+ skincolornum_t emcolor;
while (emblem)
{
@@ -11939,7 +11939,7 @@ static boolean P_SetupEmblem(mapthing_t *mthing, mobj_t *mobj)
mobj->health = j + 1;
emcolor = M_GetEmblemColor(&emblemlocations[j]); // workaround for compiler complaint about bad function casting
- mobj->color = (UINT8)emcolor;
+ mobj->color = (UINT16)emcolor;
if (emblemlocations[j].collected
|| (emblemlocations[j].type == ET_SKIN && emblemlocations[j].var != players[0].skin))
@@ -12578,7 +12578,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
break;
case MT_BALLOON:
if (mthing->angle > 0)
- mobj->color = ((mthing->angle - 1) % (MAXSKINCOLORS - 1)) + 1;
+ mobj->color = ((mthing->angle - 1) % (numskincolors - 1)) + 1;
break;
#define makesoftwarecorona(mo, h) \
corona = P_SpawnMobjFromMobj(mo, 0, 0, h<<FRACBITS, MT_PARTICLE);\
diff --git a/src/p_mobj.h b/src/p_mobj.h
index eda7383df2efdeb03b7846ad2310db01b0a8aad0..dae8c8a86079726aa17ebf45f4283761960d26d0 100644
--- a/src/p_mobj.h
+++ b/src/p_mobj.h
@@ -312,7 +312,7 @@ typedef struct mobj_s
void *skin; // overrides 'sprite' when non-NULL (for player bodies to 'remember' the skin)
// Player and mobj sprites in multiplayer modes are modified
// using an internal color lookup table for re-indexing.
- UINT8 color; // This replaces MF_TRANSLATION. Use 0 for default (no translation).
+ UINT16 color; // This replaces MF_TRANSLATION. Use 0 for default (no translation).
// Interaction info, by BLOCKMAP.
// Links in blocks (if needed).
diff --git a/src/p_saveg.c b/src/p_saveg.c
index bec64ed35773e3082845084c1993faf16e101740..d6abf423258362f4aa9a277300de58c4f0108c72 100644
--- a/src/p_saveg.c
+++ b/src/p_saveg.c
@@ -1593,7 +1593,7 @@ static void SaveMobjThinker(const thinker_t *th, const UINT8 type)
if (diff2 & MD2_SKIN)
WRITEUINT8(save_p, (UINT8)((skin_t *)mobj->skin - skins));
if (diff2 & MD2_COLOR)
- WRITEUINT8(save_p, mobj->color);
+ WRITEUINT16(save_p, mobj->color);
if (diff2 & MD2_EXTVAL1)
WRITEINT32(save_p, mobj->extravalue1);
if (diff2 & MD2_EXTVAL2)
@@ -2600,7 +2600,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
if (diff2 & MD2_SKIN)
mobj->skin = &skins[READUINT8(save_p)];
if (diff2 & MD2_COLOR)
- mobj->color = READUINT8(save_p);
+ mobj->color = READUINT16(save_p);
if (diff2 & MD2_EXTVAL1)
mobj->extravalue1 = READINT32(save_p);
if (diff2 & MD2_EXTVAL2)
diff --git a/src/p_spec.c b/src/p_spec.c
index d45a33c47d5b3bee989d6d6e00d67af1ef15f64e..cee21036ad3d048043980f21cc92356d6bf49406 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -3971,7 +3971,7 @@ static void P_ProcessLineSpecial(line_t *line, mobj_t *mo, sector_t *callsec)
if (mo)
{
- if (color < 0 || color >= MAXTRANSLATIONS)
+ if (color < 0 || color >= numskincolors)
return;
var1 = 0;
diff --git a/src/p_user.c b/src/p_user.c
index ca1001f577abb032f336e0a59a8fa3b2f55ec41c..4b2849b1c1d39dddfbfd46be13e893565c786564 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1916,7 +1916,7 @@ void P_SpawnShieldOrb(player_t *player)
shieldobj->colorized = true;
}
else
- shieldobj->color = (UINT8)shieldobj->info->painchance;
+ shieldobj->color = (UINT16)shieldobj->info->painchance;
shieldobj->threshold = (player->powers[pw_shield] & SH_FORCE) ? SH_FORCE : (player->powers[pw_shield] & SH_NOSTACK);
if (shieldobj->info->seestate)
@@ -2986,7 +2986,7 @@ static void P_CheckInvincibilityTimer(player_t *player)
return;
if (mariomode && !player->powers[pw_super])
- player->mo->color = (UINT8)(SKINCOLOR_RUBY + (leveltime % (MAXSKINCOLORS - SKINCOLOR_RUBY))); // Passes through all saturated colours
+ player->mo->color = (UINT16)(SKINCOLOR_RUBY + (leveltime % (numskincolors - SKINCOLOR_RUBY))); // Passes through all saturated colours
else if (leveltime % (TICRATE/7) == 0)
{
mobj_t *sparkle = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z, MT_IVSP);
diff --git a/src/r_draw.c b/src/r_draw.c
index 0155ec113365735bd1e76ac1bceac4d121875b4f..5351ef37f079b151a0c5c3effd5fe3d006109783 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -135,318 +135,6 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
static UINT8** translationtablecache[MAXSKINS + 7] = {NULL};
-const UINT8 Color_Index[MAXTRANSLATIONS-1][16] = {
- // {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, // SKINCOLOR_NONE
-
- // Greyscale ranges
- {0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11}, // SKINCOLOR_WHITE
- {0x00, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x05, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x11, 0x12}, // SKINCOLOR_BONE
- {0x02, 0x03, 0x04, 0x05, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14}, // SKINCOLOR_CLOUDY
- {0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18}, // SKINCOLOR_GREY
- {0x02, 0x03, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1b, 0x1d, 0x1f}, // SKINCOLOR_SILVER
- {0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x16, 0x17, 0x17, 0x19, 0x19, 0x1a, 0x1a, 0x1b, 0x1c, 0x1d}, // SKINCOLOR_CARBON
- {0x00, 0x05, 0x0a, 0x0f, 0x14, 0x19, 0x1a, 0x1b, 0x1c, 0x1e, 0x1e, 0x1e, 0x1f, 0x1f, 0x1f, 0x1f}, // SKINCOLOR_JET
- {0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1b, 0x1b, 0x1c, 0x1d, 0x1d, 0x1e, 0x1e, 0x1f, 0x1f}, // SKINCOLOR_BLACK
-
- // Desaturated
- {0x00, 0x00, 0x01, 0x02, 0x02, 0x03, 0x91, 0x91, 0x91, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xaf}, // SKINCOLOR_AETHER
- {0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0xaa, 0xaa, 0xaa, 0xab, 0xac, 0xac, 0xad, 0xad, 0xae, 0xaf}, // SKINCOLOR_SLATE
- {0x90, 0x91, 0x92, 0x93, 0x94, 0x94, 0x95, 0xac, 0xac, 0xad, 0xad, 0xa8, 0xa8, 0xa9, 0xfd, 0xfe}, // SKINCOLOR_BLUEBELL
- {0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0xd3, 0xd3, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0x2b, 0x2c, 0x2e}, // SKINCOLOR_PINK
- {0xd0, 0x30, 0xd8, 0xd9, 0xda, 0xdb, 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe3, 0xe6, 0xe8, 0xe9}, // SKINCOLOR_YOGURT
- {0xdf, 0xe0, 0xe1, 0xe2, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef}, // SKINCOLOR_BROWN
- {0xde, 0xe0, 0xe1, 0xe4, 0xe7, 0xe9, 0xeb, 0xec, 0xed, 0xed, 0xed, 0x19, 0x19, 0x1b, 0x1d, 0x1e}, // SKINCOLOR_BRONZE
- {0x51, 0x51, 0x54, 0x54, 0x55, 0x55, 0x56, 0x56, 0x56, 0x57, 0xf5, 0xf5, 0xf9, 0xf9, 0xed, 0xed}, // SKINCOLOR_TAN
- {0x54, 0x55, 0x56, 0x56, 0xf2, 0xf3, 0xf3, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfb, 0xed, 0xed}, // SKINCOLOR_BEIGE
- {0x58, 0x58, 0x59, 0x59, 0x5a, 0x5a, 0x5b, 0x5b, 0x5b, 0x5c, 0x5d, 0x5d, 0x5e, 0x5e, 0x5f, 0x5f}, // SKINCOLOR_MOSS
- {0x90, 0x90, 0x91, 0x91, 0xaa, 0xaa, 0xab, 0xab, 0xab, 0xac, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf}, // SKINCOLOR_AZURE
- {0xc0, 0xc0, 0xc1, 0xc1, 0xc2, 0xc2, 0xc3, 0xc3, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7}, // SKINCOLOR_LAVENDER
-
- // Viv's vivid colours (toast 21/07/17)
- {0xb0, 0xb0, 0xc9, 0xca, 0xcc, 0x26, 0x27, 0x28, 0x29, 0x2a, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfd}, // SKINCOLOR_RUBY
- {0xd0, 0xd0, 0xd1, 0xd2, 0x20, 0x21, 0x24, 0x25, 0x26, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e}, // SKINCOLOR_SALMON
- {0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x47, 0x2e, 0x2f}, // SKINCOLOR_RED
- {0x27, 0x27, 0x28, 0x28, 0x29, 0x2a, 0x2b, 0x2b, 0x2c, 0x2d, 0x2e, 0x2e, 0x2e, 0x2f, 0x2f, 0x1f}, // SKINCOLOR_CRIMSON
- {0x31, 0x32, 0x33, 0x36, 0x22, 0x22, 0x25, 0x25, 0x25, 0xcd, 0xcf, 0xcf, 0xc5, 0xc5, 0xc7, 0xc7}, // SKINCOLOR_FLAME
- {0x48, 0x49, 0x40, 0x33, 0x34, 0x36, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2b, 0x2c, 0x47, 0x2e, 0x2f}, // SKINCOLOR_KETCHUP
- {0xd0, 0x30, 0x31, 0x31, 0x32, 0x32, 0xdc, 0xdc, 0xdc, 0xd3, 0xd4, 0xd4, 0xcc, 0xcd, 0xce, 0xcf}, // SKINCOLOR_PEACHY
- {0xd8, 0xd9, 0xdb, 0xdc, 0xde, 0xdf, 0xd5, 0xd5, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0x1d, 0x1f}, // SKINCOLOR_QUAIL
- {0x51, 0x52, 0x40, 0x40, 0x34, 0x36, 0xd5, 0xd5, 0xd6, 0xd7, 0xcf, 0xcf, 0xc6, 0xc6, 0xc7, 0xfe}, // SKINCOLOR_SUNSET
- {0x58, 0x54, 0x40, 0x34, 0x35, 0x38, 0x3a, 0x3c, 0x3d, 0x2a, 0x2b, 0x2c, 0x2c, 0xba, 0xba, 0xbb}, // SKINCOLOR_COPPER
- {0x00, 0xd8, 0xd9, 0xda, 0xdb, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e}, // SKINCOLOR_APRICOT
- {0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x2c}, // SKINCOLOR_ORANGE
- {0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3c, 0x3d, 0x3d, 0x3d, 0x3f, 0x2c, 0x2d, 0x47, 0x2e, 0x2f, 0x2f}, // SKINCOLOR_RUST
- {0x51, 0x51, 0x54, 0x54, 0x41, 0x42, 0x43, 0x43, 0x44, 0x45, 0x46, 0x3f, 0x2d, 0x2e, 0x2f, 0x2f}, // SKINCOLOR_GOLD
- {0x53, 0x40, 0x41, 0x42, 0x43, 0xe6, 0xe9, 0xe9, 0xea, 0xec, 0xec, 0xc6, 0xc6, 0xc7, 0xc7, 0xfe}, // SKINCOLOR_SANDY
- {0x52, 0x53, 0x49, 0x49, 0x4a, 0x4a, 0x4b, 0x4b, 0x4b, 0x4c, 0x4d, 0x4d, 0x4e, 0x4e, 0x4f, 0xed}, // SKINCOLOR_YELLOW
- {0x4b, 0x4b, 0x4c, 0x4c, 0x4d, 0x4e, 0xe7, 0xe7, 0xe9, 0xc5, 0xc5, 0xc6, 0xc6, 0xc7, 0xc7, 0xfd}, // SKINCOLOR_OLIVE
- {0x50, 0x51, 0x52, 0x53, 0x48, 0xbc, 0xbd, 0xbe, 0xbe, 0xbf, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, // SKINCOLOR_LIME
- {0x58, 0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbe, 0xbe, 0xbe, 0xbf, 0x5e, 0x5e, 0x5f, 0x5f, 0x77, 0x77}, // SKINCOLOR_PERIDOT
- {0x49, 0x49, 0xbc, 0xbd, 0xbe, 0xbe, 0xbe, 0x67, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6d}, // SKINCOLOR_APPLE
- {0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f}, // SKINCOLOR_GREEN
- {0x65, 0x66, 0x67, 0x68, 0x69, 0x69, 0x6a, 0x6b, 0x6b, 0x6c, 0x6d, 0x6d, 0x6e, 0x6e, 0x6e, 0x6f}, // SKINCOLOR_FOREST
- {0x70, 0x70, 0x71, 0x71, 0x72, 0x72, 0x73, 0x73, 0x73, 0x74, 0x75, 0x75, 0x76, 0x76, 0x77, 0x77}, // SKINCOLOR_EMERALD
- {0x00, 0x00, 0x58, 0x58, 0x59, 0x62, 0x62, 0x62, 0x64, 0x67, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a}, // SKINCOLOR_MINT
- {0x01, 0x58, 0x59, 0x5a, 0x7d, 0x7d, 0x7e, 0x7e, 0x7e, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0xfd, 0xfd}, // SKINCOLOR_SEAFOAM
- {0x78, 0x79, 0x7a, 0x7a, 0x7b, 0x7b, 0x7c, 0x7c, 0x7c, 0x7d, 0x7e, 0x7e, 0x7f, 0x7f, 0x76, 0x77}, // SKINCOLOR_AQUA
- {0x78, 0x78, 0x8c, 0x8c, 0x8d, 0x8d, 0x8d, 0x8e, 0x8e, 0x8f, 0x8f, 0x8f, 0x8a, 0x8a, 0x8a, 0x8a}, // SKINCOLOR_TEAL
- {0x00, 0x78, 0x78, 0x79, 0x8d, 0x87, 0x88, 0x89, 0x89, 0xae, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfd}, // SKINCOLOR_WAVE
- {0x80, 0x81, 0xff, 0xff, 0x83, 0x83, 0x8d, 0x8d, 0x8d, 0x8e, 0x7e, 0x7f, 0x76, 0x76, 0x77, 0x6e}, // SKINCOLOR_CYAN
- {0x80, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x85, 0x85, 0x86, 0x87, 0x88, 0x89, 0x89, 0x8a, 0x8b}, // SKINCOLOR_SKY
- {0x85, 0x86, 0x87, 0x88, 0x88, 0x89, 0x89, 0x89, 0x8a, 0x8a, 0xfd, 0xfd, 0xfd, 0x1f, 0x1f, 0x1f}, // SKINCOLOR_CERULEAN
- {0x00, 0x00, 0x00, 0x00, 0x80, 0x81, 0x83, 0x83, 0x86, 0x87, 0x95, 0x95, 0xad, 0xad, 0xae, 0xaf}, // SKINCOLOR_ICY
- {0x80, 0x83, 0x86, 0x87, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, // SKINCOLOR_SAPPHIRE
- {0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x9a, 0x9c, 0x9d, 0x9d, 0x9e, 0x9e, 0x9e}, // SKINCOLOR_CORNFLOWER
- {0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfe}, // SKINCOLOR_BLUE
- {0x93, 0x94, 0x95, 0x96, 0x98, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xfd, 0xfd, 0xfe, 0xfe}, // SKINCOLOR_COBALT
- {0x80, 0x81, 0x83, 0x86, 0x94, 0x94, 0xa3, 0xa3, 0xa4, 0xa6, 0xa6, 0xa6, 0xa8, 0xa8, 0xa9, 0xa9}, // SKINCOLOR_VAPOR
- {0x92, 0x93, 0x94, 0x94, 0xac, 0xad, 0xad, 0xad, 0xae, 0xae, 0xaf, 0xaf, 0xa9, 0xa9, 0xfd, 0xfd}, // SKINCOLOR_DUSK
- {0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, // SKINCOLOR_PASTEL
- {0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa5, 0xa6, 0xa7, 0xa7, 0xa8, 0xa8, 0xa9, 0xa9}, // SKINCOLOR_PURPLE
- {0x00, 0xd0, 0xd0, 0xc8, 0xc8, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8}, // SKINCOLOR_BUBBLEGUM
- {0xb3, 0xb3, 0xb4, 0xb5, 0xb6, 0xb6, 0xb7, 0xb7, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb}, // SKINCOLOR_MAGENTA
- {0xb3, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xbb, 0xc7, 0xc7, 0x1d, 0x1d, 0x1e}, // SKINCOLOR_NEON
- {0xd0, 0xd1, 0xd2, 0xca, 0xcc, 0xb8, 0xb9, 0xb9, 0xba, 0xa8, 0xa8, 0xa9, 0xa9, 0xfd, 0xfe, 0xfe}, // SKINCOLOR_VIOLET
- {0x00, 0xd0, 0xd1, 0xd2, 0xd3, 0xc1, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc5, 0xc6, 0xc6, 0xfe, 0x1f}, // SKINCOLOR_LILAC
- {0xc8, 0xd3, 0xd5, 0xd6, 0xd7, 0xce, 0xcf, 0xb9, 0xb9, 0xba, 0xba, 0xa9, 0xa9, 0xa9, 0xfd, 0xfe}, // SKINCOLOR_PLUM
- {0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xcd, 0xce, 0xb9, 0xb9, 0xba, 0xba, 0xbb, 0xfe, 0xfe}, // SKINCOLOR_RASPBERRY
- {0xfc, 0xc8, 0xc8, 0xc9, 0xc9, 0xca, 0xca, 0xcb, 0xcb, 0xcc, 0xcc, 0xcd, 0xcd, 0xce, 0xce, 0xcf}, // SKINCOLOR_ROSY
-
- // {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}, // SKINCOLOR_?
-
- // super
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, 0x03}, // SKINCOLOR_SUPERSILVER1
- {0x00, 0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07}, // SKINCOLOR_SUPERSILVER2
- {0x01, 0x02, 0x02, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b}, // SKINCOLOR_SUPERSILVER3
- {0x02, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11}, // SKINCOLOR_SUPERSILVER4
- {0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x07, 0x09, 0x0b, 0x0d, 0x0f, 0x11, 0x13}, // SKINCOLOR_SUPERSILVER5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2}, // SKINCOLOR_SUPERRED1
- {0x00, 0x00, 0x00, 0xd0, 0xd0, 0xd0, 0xd1, 0xd1, 0xd1, 0xd2, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21}, // SKINCOLOR_SUPERRED2
- {0x00, 0x00, 0xd0, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23}, // SKINCOLOR_SUPERRED3
- {0x00, 0xd0, 0xd1, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24}, // SKINCOLOR_SUPERRED4
- {0xd0, 0xd1, 0xd2, 0xd2, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25}, // SKINCOLOR_SUPERRED5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34}, // SKINCOLOR_SUPERORANGE1
- {0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34}, // SKINCOLOR_SUPERORANGE2
- {0x00, 0x00, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x31, 0x32, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x35}, // SKINCOLOR_SUPERORANGE3
- {0x00, 0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46}, // SKINCOLOR_SUPERORANGE4
- {0xd0, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x44, 0x45, 0x46, 0x47}, // SKINCOLOR_SUPERORANGE5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x52, 0x53, 0x48, 0x48, 0x48}, // SKINCOLOR_SUPERGOLD1
- {0x00, 0x50, 0x51, 0x52, 0x53, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x41, 0x41}, // SKINCOLOR_SUPERGOLD2
- {0x51, 0x52, 0x53, 0x53, 0x48, 0x49, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x43, 0x43}, // SKINCOLOR_SUPERGOLD3
- {0x53, 0x48, 0x48, 0x49, 0x49, 0x49, 0x49, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x46, 0x46}, // SKINCOLOR_SUPERGOLD4
- {0x48, 0x48, 0x49, 0x49, 0x49, 0x40, 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x47, 0x47}, // SKINCOLOR_SUPERGOLD5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc}, // SKINCOLOR_SUPERPERIDOT1
- {0x00, 0x58, 0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe}, // SKINCOLOR_SUPERPERIDOT2
- {0x58, 0x58, 0xbc, 0xbc, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf}, // SKINCOLOR_SUPERPERIDOT3
- {0x58, 0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f}, // SKINCOLOR_SUPERPERIDOT4
- {0xbc, 0xbc, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbd, 0xbe, 0xbe, 0xbf, 0xbf, 0x5e, 0x5e, 0x5f, 0x77}, // SKINCOLOR_SUPERPERIDOT5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x81, 0x82, 0x83, 0x84}, // SKINCOLOR_SUPERSKY1
- {0x00, 0x80, 0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86}, // SKINCOLOR_SUPERSKY2
- {0x81, 0x82, 0x83, 0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87}, // SKINCOLOR_SUPERSKY3
- {0x83, 0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a}, // SKINCOLOR_SUPERSKY4
- {0x84, 0x84, 0x85, 0x85, 0x85, 0x85, 0x85, 0x85, 0x86, 0x86, 0x87, 0x87, 0x88, 0x89, 0x8a, 0x8b}, // SKINCOLOR_SUPERSKY5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, 0x90, 0xa0, 0xa0, 0xa1, 0xa2}, // SKINCOLOR_SUPERPURPLE1
- {0x00, 0x90, 0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5}, // SKINCOLOR_SUPERPURPLE2
- {0xa0, 0xa0, 0xa1, 0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6}, // SKINCOLOR_SUPERPURPLE3
- {0xa1, 0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9}, // SKINCOLOR_SUPERPURPLE4
- {0xa2, 0xa2, 0xa3, 0xa3, 0xa3, 0xa3, 0xa4, 0xa4, 0xa5, 0xa5, 0xa6, 0xa6, 0xa7, 0xa8, 0xa9, 0xfd}, // SKINCOLOR_SUPERPURPLE5
-
- {0x00, 0xd0, 0xd0, 0xd0, 0x30, 0x30, 0x31, 0x32, 0x33, 0x37, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x2e}, // SKINCOLOR_SUPERRUST1
- {0x30, 0x31, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x38, 0x3a, 0x44, 0x45, 0x46, 0x47, 0x47, 0x2e}, // SKINCOLOR_SUPERRUST2
- {0x31, 0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x3a, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x2e, 0x2e}, // SKINCOLOR_SUPERRUST3
- {0x48, 0x40, 0x41, 0x42, 0x43, 0x44, 0x44, 0x45, 0x45, 0x46, 0x46, 0x47, 0x47, 0x2e, 0x2e, 0x2e}, // SKINCOLOR_SUPERRUST4
- {0x41, 0x42, 0x43, 0x43, 0x44, 0x44, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xed, 0xee, 0xee, 0xef, 0xef}, // SKINCOLOR_SUPERRUST5
-
- {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52}, // SKINCOLOR_SUPERTAN1
- {0x00, 0x50, 0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5}, // SKINCOLOR_SUPERTAN2
- {0x50, 0x51, 0x51, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9}, // SKINCOLOR_SUPERTAN3
- {0x51, 0x52, 0x52, 0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed}, // SKINCOLOR_SUPERTAN4
- {0x52, 0x52, 0x54, 0x54, 0x54, 0x55, 0x56, 0x57, 0xf5, 0xf7, 0xf9, 0xfb, 0xed, 0xee, 0xef, 0xef} // SKINCOLOR_SUPERTAN5
-};
-
-// See also the enum skincolors_t
-// TODO Callum: Can this be translated?
-const char *Color_Names[MAXSKINCOLORS + NUMSUPERCOLORS] =
-{
- "None", // SKINCOLOR_NONE,
-
- // Greyscale ranges
- "White", // SKINCOLOR_WHITE,
- "Bone", // SKINCOLOR_BONE,
- "Cloudy", // SKINCOLOR_CLOUDY,
- "Grey", // SKINCOLOR_GREY,
- "Silver", // SKINCOLOR_SILVER,
- "Carbon", // SKINCOLOR_CARBON,
- "Jet", // SKINCOLOR_JET,
- "Black", // SKINCOLOR_BLACK,
-
- // Desaturated
- "Aether", // SKINCOLOR_AETHER,
- "Slate", // SKINCOLOR_SLATE,
- "Bluebell", // SKINCOLOR_BLUEBELL,
- "Pink", // SKINCOLOR_PINK,
- "Yogurt", // SKINCOLOR_YOGURT,
- "Brown", // SKINCOLOR_BROWN,
- "Bronze", // SKINCOLOR_BRONZE,
- "Tan", // SKINCOLOR_TAN,
- "Beige", // SKINCOLOR_BEIGE,
- "Moss", // SKINCOLOR_MOSS,
- "Azure", // SKINCOLOR_AZURE,
- "Lavender", // SKINCOLOR_LAVENDER,
-
- // Viv's vivid colours (toast 21/07/17)
- "Ruby", // SKINCOLOR_RUBY,
- "Salmon", // SKINCOLOR_SALMON,
- "Red", // SKINCOLOR_RED,
- "Crimson", // SKINCOLOR_CRIMSON,
- "Flame", // SKINCOLOR_FLAME,
- "Ketchup", // SKINCOLOR_KETCHUP,
- "Peachy", // SKINCOLOR_PEACHY,
- "Quail", // SKINCOLOR_QUAIL,
- "Sunset", // SKINCOLOR_SUNSET,
- "Copper", // SKINCOLOR_COPPER,
- "Apricot", // SKINCOLOR_APRICOT,
- "Orange", // SKINCOLOR_ORANGE,
- "Rust", // SKINCOLOR_RUST,
- "Gold", // SKINCOLOR_GOLD,
- "Sandy", // SKINCOLOR_SANDY,
- "Yellow", // SKINCOLOR_YELLOW,
- "Olive", // SKINCOLOR_OLIVE,
- "Lime", // SKINCOLOR_LIME,
- "Peridot", // SKINCOLOR_PERIDOT,
- "Apple", // SKINCOLOR_APPLE,
- "Green", // SKINCOLOR_GREEN,
- "Forest", // SKINCOLOR_FOREST,
- "Emerald", // SKINCOLOR_EMERALD,
- "Mint", // SKINCOLOR_MINT,
- "Seafoam", // SKINCOLOR_SEAFOAM,
- "Aqua", // SKINCOLOR_AQUA,
- "Teal", // SKINCOLOR_TEAL,
- "Wave", // SKINCOLOR_WAVE,
- "Cyan", // SKINCOLOR_CYAN,
- "Sky", // SKINCOLOR_SKY,
- "Cerulean", // SKINCOLOR_CERULEAN,
- "Icy", // SKINCOLOR_ICY,
- "Sapphire", // SKINCOLOR_SAPPHIRE,
- "Cornflower", // SKINCOLOR_CORNFLOWER,
- "Blue", // SKINCOLOR_BLUE,
- "Cobalt", // SKINCOLOR_COBALT,
- "Vapor", // SKINCOLOR_VAPOR,
- "Dusk", // SKINCOLOR_DUSK,
- "Pastel", // SKINCOLOR_PASTEL,
- "Purple", // SKINCOLOR_PURPLE,
- "Bubblegum", // SKINCOLOR_BUBBLEGUM,
- "Magenta", // SKINCOLOR_MAGENTA,
- "Neon", // SKINCOLOR_NEON,
- "Violet", // SKINCOLOR_VIOLET,
- "Lilac", // SKINCOLOR_LILAC,
- "Plum", // SKINCOLOR_PLUM,
- "Raspberry", // SKINCOLOR_RASPBERRY,
- "Rosy", // SKINCOLOR_ROSY,
-
- // Super behaves by different rules (one name per 5 colours), and will be accessed exclusively via R_GetSuperColorByName instead of R_GetColorByName.
- "Silver", // SKINCOLOR_SUPERSILVER1,
- "Red", // SKINCOLOR_SUPERRED1,
- "Orange", // SKINCOLOR_SUPERORANGE1,
- "Gold", // SKINCOLOR_SUPERGOLD1,
- "Peridot", // SKINCOLOR_SUPERPERIDOT1,
- "Sky", // SKINCOLOR_SUPERSKY1,
- "Purple", // SKINCOLOR_SUPERPURPLE1,
- "Rust", // SKINCOLOR_SUPERRUST1,
- "Tan" // SKINCOLOR_SUPERTAN1,
-};
-
-/*
-A word of warning: If the following array is non-symmetrical,
-A_SignPlayer's prefoppositecolor behaviour will break.
-*/
-// [0] = opposite skin color,
-// [1] = shade index used by signpost, 0-15 (actual sprite frame is 15 minus this value)
-const UINT8 Color_Opposite[MAXSKINCOLORS - 1][2] =
-{
- // {SKINCOLOR_NONE, 8}, // SKINCOLOR_NONE
-
- // Greyscale ranges
- {SKINCOLOR_BLACK, 5}, // SKINCOLOR_WHITE,
- {SKINCOLOR_JET, 7}, // SKINCOLOR_BONE,
- {SKINCOLOR_CARBON, 7}, // SKINCOLOR_CLOUDY,
- {SKINCOLOR_AETHER, 12}, // SKINCOLOR_GREY,
- {SKINCOLOR_SLATE, 12}, // SKINCOLOR_SILVER,
- {SKINCOLOR_CLOUDY, 7}, // SKINCOLOR_CARBON,
- {SKINCOLOR_BONE, 7}, // SKINCOLOR_JET,
- {SKINCOLOR_WHITE, 7}, // SKINCOLOR_BLACK,
-
- // Desaturated
- {SKINCOLOR_GREY, 15}, // SKINCOLOR_AETHER,
- {SKINCOLOR_SILVER, 12}, // SKINCOLOR_SLATE,
- {SKINCOLOR_COPPER, 4}, // SKINCOLOR_BLUEBELL,
- {SKINCOLOR_AZURE, 9}, // SKINCOLOR_PINK,
- {SKINCOLOR_RUST, 7}, // SKINCOLOR_YOGURT,
- {SKINCOLOR_TAN, 2}, // SKINCOLOR_BROWN,
- {SKINCOLOR_KETCHUP, 0}, // SKINCOLOR_BRONZE,
- {SKINCOLOR_BROWN, 12}, // SKINCOLOR_TAN,
- {SKINCOLOR_MOSS, 5}, // SKINCOLOR_BEIGE,
- {SKINCOLOR_BEIGE, 13}, // SKINCOLOR_MOSS,
- {SKINCOLOR_PINK, 5}, // SKINCOLOR_AZURE,
- {SKINCOLOR_GOLD, 4}, // SKINCOLOR_LAVENDER,
-
- // Viv's vivid colours (toast 21/07/17)
- {SKINCOLOR_EMERALD, 10}, // SKINCOLOR_RUBY,
- {SKINCOLOR_FOREST, 6}, // SKINCOLOR_SALMON,
- {SKINCOLOR_GREEN, 10}, // SKINCOLOR_RED,
- {SKINCOLOR_ICY, 10}, // SKINCOLOR_CRIMSON,
- {SKINCOLOR_PURPLE, 8}, // SKINCOLOR_FLAME,
- {SKINCOLOR_BRONZE, 8}, // SKINCOLOR_KETCHUP,
- {SKINCOLOR_TEAL, 7}, // SKINCOLOR_PEACHY,
- {SKINCOLOR_WAVE, 5}, // SKINCOLOR_QUAIL,
- {SKINCOLOR_SAPPHIRE, 5}, // SKINCOLOR_SUNSET,
- {SKINCOLOR_BLUEBELL, 5}, // SKINCOLOR_COPPER
- {SKINCOLOR_CYAN, 4}, // SKINCOLOR_APRICOT,
- {SKINCOLOR_BLUE, 4}, // SKINCOLOR_ORANGE,
- {SKINCOLOR_YOGURT, 8}, // SKINCOLOR_RUST,
- {SKINCOLOR_LAVENDER, 10}, // SKINCOLOR_GOLD,
- {SKINCOLOR_SKY, 8}, // SKINCOLOR_SANDY,
- {SKINCOLOR_CORNFLOWER, 8}, // SKINCOLOR_YELLOW,
- {SKINCOLOR_DUSK, 3}, // SKINCOLOR_OLIVE,
- {SKINCOLOR_MAGENTA, 9}, // SKINCOLOR_LIME,
- {SKINCOLOR_COBALT, 2}, // SKINCOLOR_PERIDOT,
- {SKINCOLOR_RASPBERRY, 13}, // SKINCOLOR_APPLE,
- {SKINCOLOR_RED, 6}, // SKINCOLOR_GREEN,
- {SKINCOLOR_SALMON, 9}, // SKINCOLOR_FOREST,
- {SKINCOLOR_RUBY, 4}, // SKINCOLOR_EMERALD,
- {SKINCOLOR_VIOLET, 5}, // SKINCOLOR_MINT,
- {SKINCOLOR_PLUM, 6}, // SKINCOLOR_SEAFOAM,
- {SKINCOLOR_ROSY, 7}, // SKINCOLOR_AQUA,
- {SKINCOLOR_PEACHY, 7}, // SKINCOLOR_TEAL,
- {SKINCOLOR_QUAIL, 5}, // SKINCOLOR_WAVE,
- {SKINCOLOR_APRICOT, 6}, // SKINCOLOR_CYAN,
- {SKINCOLOR_SANDY, 1}, // SKINCOLOR_SKY,
- {SKINCOLOR_NEON, 4}, // SKINCOLOR_CERULEAN,
- {SKINCOLOR_CRIMSON, 0}, // SKINCOLOR_ICY,
- {SKINCOLOR_SUNSET, 5}, // SKINCOLOR_SAPPHIRE,
- {SKINCOLOR_YELLOW, 4}, // SKINCOLOR_CORNFLOWER,
- {SKINCOLOR_ORANGE, 5}, // SKINCOLOR_BLUE,
- {SKINCOLOR_PERIDOT, 5}, // SKINCOLOR_COBALT,
- {SKINCOLOR_LILAC, 4}, // SKINCOLOR_VAPOR,
- {SKINCOLOR_OLIVE, 0}, // SKINCOLOR_DUSK,
- {SKINCOLOR_BUBBLEGUM, 9}, // SKINCOLOR_PASTEL,
- {SKINCOLOR_FLAME, 7}, // SKINCOLOR_PURPLE,
- {SKINCOLOR_PASTEL, 8}, // SKINCOLOR_BUBBLEGUM,
- {SKINCOLOR_LIME, 6}, // SKINCOLOR_MAGENTA,
- {SKINCOLOR_CERULEAN, 2}, // SKINCOLOR_NEON,
- {SKINCOLOR_MINT, 6}, // SKINCOLOR_VIOLET,
- {SKINCOLOR_VAPOR, 4}, // SKINCOLOR_LILAC,
- {SKINCOLOR_MINT, 7}, // SKINCOLOR_PLUM,
- {SKINCOLOR_APPLE, 13}, // SKINCOLOR_RASPBERRY
- {SKINCOLOR_AQUA, 1} // SKINCOLOR_ROSY,
-};
-
CV_PossibleValue_t Color_cons_t[MAXSKINCOLORS+1];
/** \brief The R_InitTranslationTables
@@ -496,7 +184,7 @@ void R_InitTranslationTables(void)
\param dest_colormap colormap to populate
\param skincolor translation color
*/
-static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
+static void R_RainbowColormap(UINT8 *dest_colormap, UINT16 skincolor)
{
INT32 i;
RGBA_t color;
@@ -509,7 +197,7 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
// first generate the brightness of all the colours of that skincolour
for (i = 0; i < 16; i++)
{
- color = V_GetColor(Color_Index[skincolor-1][i]);
+ color = V_GetColor(skincolors[skincolor].ramp[i]);
SETBRIGHTNESS(colorbrightnesses[i], color.s.red, color.s.green, color.s.blue);
}
@@ -530,7 +218,7 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
if (temp < brightdif)
{
brightdif = (UINT16)temp;
- dest_colormap[i] = Color_Index[skincolor-1][j];
+ dest_colormap[i] = skincolors[skincolor].ramp[j];
}
}
}
@@ -538,7 +226,7 @@ static void R_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor)
#undef SETBRIGHTNESS
-static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, UINT8 color)
+static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, UINT16 color)
{
INT32 i, starttranscolor, skinramplength;
@@ -551,7 +239,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
memset(dest_colormap, 0, NUM_PALETTE_ENTRIES * sizeof(UINT8));
return;
case TC_RAINBOW:
- if (color >= MAXTRANSLATIONS)
+ if (color >= numskincolors)
I_Error("Invalid skin color #%hu.", (UINT16)color);
if (color != SKINCOLOR_NONE)
{
@@ -560,11 +248,11 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
}
break;
case TC_BLINK:
- if (color >= MAXTRANSLATIONS)
+ if (color >= numskincolors)
I_Error("Invalid skin color #%hu.", (UINT16)color);
if (color != SKINCOLOR_NONE)
{
- memset(dest_colormap, Color_Index[color-1][3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
+ memset(dest_colormap, skincolors[color].ramp[3], NUM_PALETTE_ENTRIES * sizeof(UINT8));
return;
}
break;
@@ -585,11 +273,11 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
{
for (i = 0; i < 6; i++)
{
- dest_colormap[Color_Index[SKINCOLOR_BLUE-1][12-i]] = Color_Index[SKINCOLOR_BLUE-1][i];
+ dest_colormap[skincolors[SKINCOLOR_BLUE].ramp[12-i]] = skincolors[SKINCOLOR_BLUE].ramp[i];
}
dest_colormap[159] = dest_colormap[253] = dest_colormap[254] = 0;
for (i = 0; i < 16; i++)
- dest_colormap[96+i] = dest_colormap[Color_Index[SKINCOLOR_COBALT-1][i]];
+ dest_colormap[96+i] = dest_colormap[skincolors[SKINCOLOR_COBALT].ramp[i]];
}
else if (skinnum == TC_DASHMODE) // This is a long one, because MotorRoach basically hand-picked the indices
{
@@ -634,7 +322,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
return;
}
- if (color >= MAXTRANSLATIONS)
+ if (color >= numskincolors)
I_Error("Invalid skin color #%hu.", (UINT16)color);
starttranscolor = (skinnum != TC_DEFAULT) ? skins[skinnum].starttranscolor : DEFAULT_STARTTRANSCOLOR;
@@ -658,7 +346,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
// Build the translated ramp
for (i = 0; i < skinramplength; i++)
- dest_colormap[starttranscolor + i] = (UINT8)Color_Index[color-1][i];
+ dest_colormap[starttranscolor + i] = (UINT8)skincolors[color].ramp[i];
}
@@ -670,7 +358,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
\return Colormap. If not cached, caller should Z_Free.
*/
-UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
+UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags)
{
UINT8* ret;
INT32 skintableindex;
@@ -693,7 +381,7 @@ UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags)
// Allocate table for skin if necessary
if (!translationtablecache[skintableindex])
- translationtablecache[skintableindex] = Z_Calloc(MAXTRANSLATIONS * sizeof(UINT8**), PU_STATIC, NULL);
+ translationtablecache[skintableindex] = Z_Calloc(MAXSKINCOLORS * sizeof(UINT8**), PU_STATIC, NULL);
// Get colormap
ret = translationtablecache[skintableindex][color];
@@ -728,29 +416,32 @@ void R_FlushTranslationColormapCache(void)
for (i = 0; i < (INT32)(sizeof(translationtablecache) / sizeof(translationtablecache[0])); i++)
if (translationtablecache[i])
- memset(translationtablecache[i], 0, MAXTRANSLATIONS * sizeof(UINT8**));
+ memset(translationtablecache[i], 0, MAXSKINCOLORS * sizeof(UINT8**));
}
-UINT8 R_GetColorByName(const char *name)
+UINT16 R_GetColorByName(const char *name)
{
- UINT8 color = (UINT8)atoi(name);
- if (color > 0 && color < MAXSKINCOLORS)
+ UINT16 color = (UINT16)atoi(name);
+ if (color > 0 && color < numskincolors)
return color;
- for (color = 1; color < MAXSKINCOLORS; color++)
- if (!stricmp(Color_Names[color], name))
+ for (color = 1; color < numskincolors; color++)
+ if (!stricmp(skincolors[color].name, name))
return color;
return SKINCOLOR_GREEN;
}
-UINT8 R_GetSuperColorByName(const char *name)
+UINT16 R_GetSuperColorByName(const char *name)
{
- UINT8 color; /* = (UINT8)atoi(name); -- This isn't relevant to S_SKIN, which is the only way it's accessible right now. Let's simplify things.
- if (color > MAXSKINCOLORS && color < MAXTRANSLATIONS && !((color - MAXSKINCOLORS) % 5))
- return color;*/
- for (color = 0; color < NUMSUPERCOLORS; color++)
- if (!stricmp(Color_Names[color + MAXSKINCOLORS], name))
- return ((color*5) + MAXSKINCOLORS);
- return SKINCOLOR_SUPERGOLD1;
+ UINT16 i, color = SKINCOLOR_SUPERGOLD1;
+ char *realname = Z_Malloc(MAXCOLORNAME+1, PU_STATIC, NULL);
+ snprintf(realname, MAXCOLORNAME+1, "Super %s 1", name);
+ for (i = 1; i < numskincolors; i++)
+ if (!stricmp(skincolors[i].name, realname)) {
+ color = i;
+ break;
+ }
+ Z_Free(realname);
+ return color;
}
// ==========================================================================
diff --git a/src/r_draw.h b/src/r_draw.h
index 4d94f861b3f747f6e033b876112962916288fb78..329c4974a6ca722322fb754fd3faf90e6cd92e13 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -112,10 +112,10 @@ extern lumpnum_t viewborderlump[8];
// Initialize color translation tables, for player rendering etc.
void R_InitTranslationTables(void);
-UINT8* R_GetTranslationColormap(INT32 skinnum, skincolors_t color, UINT8 flags);
+UINT8* R_GetTranslationColormap(INT32 skinnum, skincolornum_t color, UINT8 flags);
void R_FlushTranslationColormapCache(void);
-UINT8 R_GetColorByName(const char *name);
-UINT8 R_GetSuperColorByName(const char *name);
+UINT16 R_GetColorByName(const char *name);
+UINT16 R_GetSuperColorByName(const char *name);
// Custom player skin translation
void R_InitViewBuffer(INT32 width, INT32 height);
diff --git a/src/r_skins.c b/src/r_skins.c
index caf1fb17299dc0cbad0352df4fa8ec5b71b79ef4..57ce382c4183618a66dde1c45a0874b48d5a7535 100644
--- a/src/r_skins.c
+++ b/src/r_skins.c
@@ -248,7 +248,7 @@ void SetPlayerSkinByNum(INT32 playernum, INT32 skinnum)
{
player_t *player = &players[playernum];
skin_t *skin = &skins[skinnum];
- UINT8 newcolor = 0;
+ UINT16 newcolor = 0;
if (skinnum >= 0 && skinnum < numskins && R_SkinUsable(playernum, skinnum)) // Make sure it exists!
{
diff --git a/src/r_skins.h b/src/r_skins.h
index 96697b4220038c1bdbe491cbd4943b2b4127113b..45c90bdb4b9e5964547c579abcbdd3d80ed91162 100644
--- a/src/r_skins.h
+++ b/src/r_skins.h
@@ -65,9 +65,9 @@ typedef struct
// Definable color translation table
UINT8 starttranscolor;
- UINT8 prefcolor;
- UINT8 supercolor;
- UINT8 prefoppositecolor; // if 0 use tables instead
+ UINT16 prefcolor;
+ UINT16 supercolor;
+ UINT16 prefoppositecolor; // if 0 use tables instead
fixed_t highresscale; // scale of highres, default is 0.5
UINT8 contspeed; // continue screen animation speed
diff --git a/src/sdl/i_system.c b/src/sdl/i_system.c
index d2ed62516c742cb1fcf4ba63d948202999998287..4fdcec87eddcd4a30fbe0f2045bef6ad3f9c926f 100644
--- a/src/sdl/i_system.c
+++ b/src/sdl/i_system.c
@@ -178,6 +178,8 @@ static char returnWadPath[256];
#include "../m_argv.h"
+#include "../m_menu.h"
+
#ifdef MAC_ALERT
#include "macosx/mac_alert.h"
#endif
@@ -2293,6 +2295,7 @@ void I_Quit(void)
G_StopMetalRecording(false);
D_QuitNetGame();
+ M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
@@ -2409,6 +2412,7 @@ void I_Error(const char *error, ...)
G_StopMetalRecording(false);
D_QuitNetGame();
+ M_FreePlayerSetupColors();
I_ShutdownMusic();
I_ShutdownSound();
I_ShutdownCD();
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 9d819b147ead4ab24e3abd29252a827f273c071b..086e80291275cbc174dbe700d5b248e5a78a23a6 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -456,7 +456,7 @@ boolean st_overlay;
//
// Supports different colors! woo!
static void ST_DrawNightsOverlayNum(fixed_t x /* right border */, fixed_t y, fixed_t s, INT32 a,
- UINT32 num, patch_t **numpat, skincolors_t colornum)
+ UINT32 num, patch_t **numpat, skincolornum_t colornum)
{
fixed_t w = SHORT(numpat[0]->width)*s;
const UINT8 *colormap;
@@ -992,7 +992,7 @@ static void ST_drawLivesArea(void)
static void ST_drawInput(void)
{
- const INT32 accent = V_SNAPTOLEFT|V_SNAPTOBOTTOM|(stplyr->skincolor ? Color_Index[stplyr->skincolor-1][4] : 0);
+ const INT32 accent = V_SNAPTOLEFT|V_SNAPTOBOTTOM|(stplyr->skincolor ? skincolors[stplyr->skincolor].ramp[4] : 0);
INT32 col;
UINT8 offs;
@@ -1700,14 +1700,14 @@ static void ST_drawNightsRecords(void)
// 2.0-1: [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold
/*#define NUMLINKCOLORS 14
-static skincolors_t linkColor[NUMLINKCOLORS] =
+static skincolornum_t linkColor[NUMLINKCOLORS] =
{SKINCOLOR_BEIGE, SKINCOLOR_LAVENDER, SKINCOLOR_AZURE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE,
SKINCOLOR_MAGENTA, SKINCOLOR_SILVER, SKINCOLOR_SUPERGOLD4, SKINCOLOR_PINK, SKINCOLOR_RED,
SKINCOLOR_BLUE, SKINCOLOR_GREEN, SKINCOLOR_CYAN, SKINCOLOR_GOLD};*/
// 2.2 indev list: (unix time 1470866042) <Rob> Emerald, Aqua, Cyan, Blue, Pastel, Purple, Magenta, Rosy, Red, Orange, Gold, Yellow, Peridot
/*#define NUMLINKCOLORS 13
-static skincolors_t linkColor[NUMLINKCOLORS] =
+static skincolornum_t linkColor[NUMLINKCOLORS] =
{SKINCOLOR_EMERALD, SKINCOLOR_AQUA, SKINCOLOR_CYAN, SKINCOLOR_BLUE, SKINCOLOR_PASTEL,
SKINCOLOR_PURPLE, SKINCOLOR_MAGENTA, SKINCOLOR_ROSY, SKINCOLOR_RED, SKINCOLOR_ORANGE,
SKINCOLOR_GOLD, SKINCOLOR_YELLOW, SKINCOLOR_PERIDOT};*/
@@ -1716,7 +1716,7 @@ static skincolors_t linkColor[NUMLINKCOLORS] =
// [20:00:25] <baldobo> Also Icy for the link freeze text color
// [20:04:03] <baldobo> I would start it on lime
/*#define NUMLINKCOLORS 18
-static skincolors_t linkColor[NUMLINKCOLORS] =
+static skincolornum_t linkColor[NUMLINKCOLORS] =
{SKINCOLOR_LIME, SKINCOLOR_EMERALD, SKINCOLOR_AQUA, SKINCOLOR_CYAN, SKINCOLOR_SKY,
SKINCOLOR_SAPPHIRE, SKINCOLOR_PASTEL, SKINCOLOR_PURPLE, SKINCOLOR_BUBBLEGUM, SKINCOLOR_MAGENTA,
SKINCOLOR_ROSY, SKINCOLOR_RUBY, SKINCOLOR_RED, SKINCOLOR_FLAME, SKINCOLOR_SUNSET,
@@ -1724,7 +1724,7 @@ static skincolors_t linkColor[NUMLINKCOLORS] =
// 2.2+ list for real this time: https://wiki.srb2.org/wiki/User:Rob/Sandbox (check history around 31/10/17, spoopy)
#define NUMLINKCOLORS 12
-static skincolors_t linkColor[2][NUMLINKCOLORS] = {
+static skincolornum_t linkColor[2][NUMLINKCOLORS] = {
{SKINCOLOR_EMERALD, SKINCOLOR_AQUA, SKINCOLOR_SKY, SKINCOLOR_BLUE, SKINCOLOR_PURPLE, SKINCOLOR_MAGENTA,
SKINCOLOR_ROSY, SKINCOLOR_RED, SKINCOLOR_ORANGE, SKINCOLOR_GOLD, SKINCOLOR_YELLOW, SKINCOLOR_PERIDOT},
{SKINCOLOR_SEAFOAM, SKINCOLOR_CYAN, SKINCOLOR_WAVE, SKINCOLOR_SAPPHIRE, SKINCOLOR_VAPOR, SKINCOLOR_BUBBLEGUM,
@@ -1735,7 +1735,7 @@ static void ST_drawNiGHTSLink(void)
static INT32 prevsel[2] = {0, 0}, prevtime[2] = {0, 0};
const UINT8 q = ((splitscreen && stplyr == &players[secondarydisplayplayer]) ? 1 : 0);
INT32 sel = ((stplyr->linkcount-1) / 5) % NUMLINKCOLORS, aflag = V_PERPLAYER, mag = ((stplyr->linkcount-1 >= 300) ? 1 : 0);
- skincolors_t colornum;
+ skincolornum_t colornum;
fixed_t x, y, scale;
if (sel != prevsel[q])
diff --git a/src/v_video.c b/src/v_video.c
index 1e550fe9d4c488bb0f03456485956f06bfa03da0..5a985555fdd854d593480a145e600254dfd52171 100644
--- a/src/v_video.c
+++ b/src/v_video.c
@@ -1040,7 +1040,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_
// V_DrawContinueIcon
// Draw a mini player! If we can, that is. Otherwise we draw a star.
//
-void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor)
+void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT16 skincolor)
{
if (skinnum >= 0 && skinnum < numskins && skins[skinnum].sprites[SPR2_XTRA].numframes > XTRA_CONTINUE)
{
diff --git a/src/v_video.h b/src/v_video.h
index 664fa8995fa47b9cfc7720f1d67ff17c580b1be3..9f7a9a9e9c29dd8fb23ecfbfb4d1d09d1d7cba8d 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -160,7 +160,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
void V_DrawStretchyFixedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap);
void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, INT32 scrn, patch_t *patch, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
-void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT8 skincolor);
+void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT16 skincolor);
// Draw a linear block of pixels into the view buffer.
void V_DrawBlock(INT32 x, INT32 y, INT32 scrn, INT32 width, INT32 height, const UINT8 *src);
diff --git a/src/win32/win_sys.c b/src/win32/win_sys.c
index f9d66be7ffc57c7f613b85b6a60bf28297b20781..6c4ff4484fbcbca3097a316c3502248b1af682ba 100644
--- a/src/win32/win_sys.c
+++ b/src/win32/win_sys.c
@@ -54,6 +54,8 @@
#include "../screen.h"
+#include "../m_menu.h"
+
// Wheel support for Win95/WinNT3.51
#include <zmouse.h>
@@ -650,6 +652,7 @@ void I_Error(const char *error, ...)
G_StopMetalRecording(false);
D_QuitNetGame();
+ M_FreePlayerSetupColors();
// shutdown everything that was started
I_ShutdownSystem();
@@ -746,6 +749,8 @@ void I_Quit(void)
// so do it before.
D_QuitNetGame();
+ M_FreePlayerSetupColors();
+
// shutdown everything that was started
I_ShutdownSystem();
diff --git a/src/y_inter.c b/src/y_inter.c
index a2628832fe09074bc77817604e3d72f16f49ea6d..2fe0de60519b7b965387dabd6f42912825d0a4f8 100644
--- a/src/y_inter.c
+++ b/src/y_inter.c
@@ -99,7 +99,7 @@ typedef union
UINT8 continues;
patch_t *pcontinues;
INT32 *playerchar; // Continue HUD
- UINT8 *playercolor;
+ UINT16 *playercolor;
UINT8 gotlife; // Number of extra lives obtained
} spec;
@@ -107,7 +107,7 @@ typedef union
struct
{
UINT32 scores[MAXPLAYERS]; // Winner's score
- UINT8 *color[MAXPLAYERS]; // Winner's color #
+ UINT16 *color[MAXPLAYERS]; // Winner's color #
boolean spectator[MAXPLAYERS]; // Spectator list
INT32 *character[MAXPLAYERS]; // Winner's character #
INT32 num[MAXPLAYERS]; // Winner's player #
@@ -121,7 +121,7 @@ typedef union
struct
{
- UINT8 *color[MAXPLAYERS]; // Winner's color #
+ UINT16 *color[MAXPLAYERS]; // Winner's color #
INT32 *character[MAXPLAYERS]; // Winner's character #
INT32 num[MAXPLAYERS]; // Winner's player #
char name[MAXPLAYERS][9]; // Winner's name