nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

follow-up: avoid issue with onefile concatenation

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
include/mcastu.h
View File

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

10
src/earlyarg.c
View File

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