lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'new-color-chat-fix' into 'master' 

Fix new skin colors using default chat color

See merge request STJr/SRB2!822
This commit is contained in:
Jaime Passos 2020-02-25 20:38:36 -05:00
parent b9fb6182ac ce801e1076
commit 8350a8c58a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hu_stuff.c
View File

@ -787,10 +787,12 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
case SKINCOLOR_RED: case SKINCOLOR_RED:
case SKINCOLOR_CRIMSON: case SKINCOLOR_CRIMSON:
case SKINCOLOR_FLAME: case SKINCOLOR_FLAME:
case SKINCOLOR_KETCHUP:
cstart = "\x85"; // V_REDMAP cstart = "\x85"; // V_REDMAP
break; break;
case SKINCOLOR_YOGURT: case SKINCOLOR_YOGURT:
case SKINCOLOR_BROWN: case SKINCOLOR_BROWN:
case SKINCOLOR_BRONZE:
case SKINCOLOR_TAN: case SKINCOLOR_TAN:
case SKINCOLOR_BEIGE: case SKINCOLOR_BEIGE:
case SKINCOLOR_QUAIL: case SKINCOLOR_QUAIL:
@ -818,6 +820,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
cstart = "\x8e"; // V_ROSYMAP cstart = "\x8e"; // V_ROSYMAP
break; break;
case SKINCOLOR_SUNSET: case SKINCOLOR_SUNSET:
case SKINCOLOR_COPPER:
case SKINCOLOR_APRICOT: case SKINCOLOR_APRICOT:
case SKINCOLOR_ORANGE: case SKINCOLOR_ORANGE:
case SKINCOLOR_RUST: case SKINCOLOR_RUST:
@ -831,6 +834,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
break; break;
case SKINCOLOR_LIME: case SKINCOLOR_LIME:
case SKINCOLOR_PERIDOT: case SKINCOLOR_PERIDOT:
case SKINCOLOR_APPLE:
cstart = "\x8b"; // V_PERIDOTMAP cstart = "\x8b"; // V_PERIDOTMAP
break; break;
case SKINCOLOR_SEAFOAM: case SKINCOLOR_SEAFOAM:
@ -851,12 +855,14 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
case SKINCOLOR_BLUE: case SKINCOLOR_BLUE:
case SKINCOLOR_COBALT: case SKINCOLOR_COBALT:
case SKINCOLOR_DUSK: case SKINCOLOR_DUSK:
case SKINCOLOR_BLUEBELL:
cstart = "\x84"; // V_BLUEMAP cstart = "\x84"; // V_BLUEMAP
break; break;
case SKINCOLOR_BUBBLEGUM: case SKINCOLOR_BUBBLEGUM:
case SKINCOLOR_MAGENTA: case SKINCOLOR_MAGENTA:
case SKINCOLOR_NEON: case SKINCOLOR_NEON:
case SKINCOLOR_VIOLET: case SKINCOLOR_VIOLET:
case SKINCOLOR_RASPBERRY:
cstart = "\x81"; // V_MAGENTAMAP cstart = "\x81"; // V_MAGENTAMAP
break; break;
} }