Fix extra V_MAGENTAMAP definition

This commit is contained in:
Sally Coolatta 2020-08-10 17:07:47 -04:00
parent 4b29dae036
commit 1a058cb0cd
3 changed files with 4 additions and 4 deletions

View file

@ -11539,7 +11539,7 @@ struct {
{"V_OLDSPACING",V_OLDSPACING},
{"V_MONOSPACE",V_MONOSPACE},
{"V_MAGENTAMAP",V_MAGENTAMAP},
{"V_PURPLEMAP",V_PURPLEMAP},
{"V_YELLOWMAP",V_YELLOWMAP},
{"V_GREENMAP",V_GREENMAP},
{"V_BLUEMAP",V_BLUEMAP},

View file

@ -806,7 +806,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
if (!chatcolor || chatcolor%0x1000 || chatcolor>V_TANMAP)
cstart = "\x80";
else if (chatcolor == V_MAGENTAMAP)
else if (chatcolor == V_PURPLEMAP)
cstart = "\x81";
else if (chatcolor == V_YELLOWMAP)
cstart = "\x82";
@ -828,7 +828,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
cstart = "\x8a";
else if (chatcolor == V_AQUAMAP)
cstart = "\x8b";
else if (chatcolor == V_PURPLEMAP)
else if (chatcolor == V_MAGENTAMAP)
cstart = "\x8c";
else if (chatcolor == V_PINKMAP)
cstart = "\x8d";

View file

@ -83,7 +83,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
#define V_CHARCOLORSHIFT 12
#define V_CHARCOLORMASK 0x0000F000
// for simplicity's sake, shortcuts to specific colors
#define V_MAGENTAMAP 0x00001000
#define V_PURPLEMAP 0x00001000
#define V_YELLOWMAP 0x00002000
#define V_GREENMAP 0x00003000
#define V_BLUEMAP 0x00004000