Call the substitution macro FOREACH

This commit is contained in:
James R 2020-03-31 16:45:36 -07:00
parent 1243d0940a
commit 6975de85b4
2 changed files with 27 additions and 27 deletions

View file

@ -398,9 +398,9 @@ consvar_t cv_kartusepwrlv = {"kartusepwrlv", "Yes", CV_NETVAR|CV_CHEAT, CV_YesNo
static CV_PossibleValue_t kartdebugitem_cons_t[] = static CV_PossibleValue_t kartdebugitem_cons_t[] =
{ {
#define X( name, n ) { n, #name } #define FOREACH( name, n ) { n, #name }
KART_ITEM_ITERATOR, KART_ITEM_ITERATOR,
#undef X #undef FOREACH
{0} {0}
}; };
consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; consvar_t cv_kartdebugitem = {"kartdebugitem", "0", CV_NETVAR|CV_CHEAT|CV_NOSHOWHELP, kartdebugitem_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};

View file

@ -201,38 +201,38 @@ typedef enum
} powertype_t; } powertype_t;
/* /*
To use: #define X( name, number ) To use: #define FOREACH( name, number )
Do with it whatever you want. Do with it whatever you want.
Run this macro, then #undef X afterward Run this macro, then #undef FOREACH afterward
*/ */
#define KART_ITEM_ITERATOR \ #define KART_ITEM_ITERATOR \
X (SAD, -1),\ FOREACH (SAD, -1),\
X (NONE, 0),\ FOREACH (NONE, 0),\
X (SNEAKER, 1),\ FOREACH (SNEAKER, 1),\
X (ROCKETSNEAKER, 2),\ FOREACH (ROCKETSNEAKER, 2),\
X (INVINCIBILITY, 3),\ FOREACH (INVINCIBILITY, 3),\
X (BANANA, 4),\ FOREACH (BANANA, 4),\
X (EGGMAN, 5),\ FOREACH (EGGMAN, 5),\
X (ORBINAUT, 6),\ FOREACH (ORBINAUT, 6),\
X (JAWZ, 7),\ FOREACH (JAWZ, 7),\
X (MINE, 8),\ FOREACH (MINE, 8),\
X (BALLHOG, 9),\ FOREACH (BALLHOG, 9),\
X (SPB, 10),\ FOREACH (SPB, 10),\
X (GROW, 11),\ FOREACH (GROW, 11),\
X (SHRINK, 12),\ FOREACH (SHRINK, 12),\
X (THUNDERSHIELD, 13),\ FOREACH (THUNDERSHIELD, 13),\
X (BUBBLESHIELD, 14),\ FOREACH (BUBBLESHIELD, 14),\
X (FLAMESHIELD, 15),\ FOREACH (FLAMESHIELD, 15),\
X (HYUDORO, 16),\ FOREACH (HYUDORO, 16),\
X (POGOSPRING, 17),\ FOREACH (POGOSPRING, 17),\
X (SUPERRING, 18),\ FOREACH (SUPERRING, 18),\
X (KITCHENSINK, 19) FOREACH (KITCHENSINK, 19)
typedef enum typedef enum
{ {
#define X( name, n ) KITEM_ ## name = n #define FOREACH( name, n ) KITEM_ ## name = n
KART_ITEM_ITERATOR, KART_ITEM_ITERATOR,
#undef X #undef FOREACH
NUMKARTITEMS, NUMKARTITEMS,