vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'color-flip' into 'next' 

Fix color enums more

See merge request KartKrew/Kart-Public!112
This commit is contained in:
wolfs 2019-03-11 19:28:24 -04:00
parent af67c7abf5 3de3f10ad3
commit 24b5079f20
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dehacked.c
View File

@ -8142,8 +8142,8 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"GREY", // SKINCOLOR_GREY "GREY", // SKINCOLOR_GREY
"NICKEL", // SKINCOLOR_NICKEL "NICKEL", // SKINCOLOR_NICKEL
"BLACK", // SKINCOLOR_BLACK "BLACK", // SKINCOLOR_BLACK
"POPCORN", // SKINCOLOR_POPCORN
"FAIRY", // SKINCOLOR_FAIRY "FAIRY", // SKINCOLOR_FAIRY
"POPCORN", // SKINCOLOR_POPCORN
"SEPIA", // SKINCOLOR_SEPIA "SEPIA", // SKINCOLOR_SEPIA
"BEIGE", // SKINCOLOR_BEIGE "BEIGE", // SKINCOLOR_BEIGE
"BROWN", // SKINCOLOR_BROWN "BROWN", // SKINCOLOR_BROWN

2
src/doomdef.h
View File

@ -256,8 +256,8 @@ typedef enum
SKINCOLOR_GREY, SKINCOLOR_GREY,
SKINCOLOR_NICKEL, SKINCOLOR_NICKEL,
SKINCOLOR_BLACK, SKINCOLOR_BLACK,
SKINCOLOR_POPCORN,
SKINCOLOR_FAIRY, SKINCOLOR_FAIRY,
SKINCOLOR_POPCORN,
SKINCOLOR_SEPIA, SKINCOLOR_SEPIA,
SKINCOLOR_BEIGE, SKINCOLOR_BEIGE,
SKINCOLOR_BROWN, SKINCOLOR_BROWN,