follow-up: avoid issue with onefile concatenation

This commit is contained in:
nhmall
2026-04-01 10:59:22 -04:00
parent ab459265b0
commit e377591240
2 changed files with 9 additions and 7 deletions

View File

@@ -9,8 +9,10 @@
#define MONSPELL(def, lvl, flags) MCAST_##def
#elif defined(MCASTU_INIT)
#define MONSPELL(def, lvl, flags) { lvl, flags }
#elif defined(DUMP_MCASTU_ENUM)
#define MONSPELL(def, lvl, flags) { MCAST_##def, #def }
#elif defined(DUMP_MCASTU_ENUM1)
#define MONSPELL(def, lvl, flags) MCAST_DUMPENUM_##def
#elif defined(DUMP_MCASTU_ENUM2)
#define MONSPELL(def, lvl, flags) { MCAST_DUMPENUM_##def, #def }
#endif
MONSPELL(PSI_BOLT, 0, MCF_HOSTILE|MCF_SIGHT),

View File

@@ -289,17 +289,17 @@ static struct enum_dump arti_enum_dump[] = {
#undef DUMP_ARTI_ENUM
/* the enums are not part of hack.h for this one */
#define MCASTU_ENUM
enum mcast_spells {
#define DUMP_MCASTU_ENUM1
enum mcast_dumpenum_spells {
#include "mcastu.h"
};
#undef MCASTU_ENUM
#undef DUMP_MCASTU_ENUM1
#define DUMP_MCASTU_ENUM
#define DUMP_MCASTU_ENUM2
static struct enum_dump mcastu_enum_dump[] = {
#include "mcastu.h"
};
#undef DUMP_MCASTU_ENUM
#undef DUMP_MCASTU_ENUM2
#undef DUMP_ENUMS