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

add artifact_nums to nethack --dumpenums

Browse Source
This commit is contained in:
nhmall
2023-12-15 19:59:26 -05:00
parent bf5b4c40e2
commit c0acf2f89f
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/artilist.h
View File

@@ -13,8 +13,13 @@ static const char *const artifact_names[] = {
#elif defined(ARTI_ENUM) #elif defined(ARTI_ENUM)
#define A(nam, typ, s1, s2, mt, atk, dfn, cry, inv, al, cl, rac, \ #define A(nam, typ, s1, s2, mt, atk, dfn, cry, inv, al, cl, rac, \
cost, clr, bn) \ cost, clr, bn) \
ART_##bn ART_##bn
#elif defined(DUMP_ARTI_ENUM)
#define A(nam, typ, s1, s2, mt, atk, dfn, cry, inv, al, cl, rac, \
cost, clr, bn) \
{ ART_##bn, "ART_" #bn }
#else #else
/* in artifact.c, set up the actual artifact list structure */ /* in artifact.c, set up the actual artifact list structure */
@@ -259,7 +264,7 @@ A("The Palantir of Westernesse", CRYSTAL_BALL,
NO_ATTK, DFNS(AD_MAGM), NO_CARY, CREATE_PORTAL, A_NEUTRAL, PM_WIZARD, NO_ATTK, DFNS(AD_MAGM), NO_CARY, CREATE_PORTAL, A_NEUTRAL, PM_WIZARD,
NON_PM, 4000L, NO_COLOR, EYE_OF_THE_AETHIOPICA), NON_PM, 4000L, NO_COLOR, EYE_OF_THE_AETHIOPICA),
#if !defined(ARTI_ENUM) #if !defined(ARTI_ENUM) && !defined(DUMP_ARTI_ENUM)
/* /*
* terminator; otyp must be zero * terminator; otyp must be zero
*/ */

20
src/allmain.c
View File

@@ -1143,8 +1143,16 @@ struct enum_dump objclass_syms_dump[] = {
}; };
#undef DUMP_ENUMS_OBJCLASS_SYMS #undef DUMP_ENUMS_OBJCLASS_SYMS
#define DUMP_ARTI_ENUM
struct enum_dump arti_enum_dump[] = {
#include "artilist.h"
{ AFTER_LAST_ARTIFACT, "AFTER_LAST_ARTIFACT" }
};
#undef DUMP_ARTI_ENUM
#undef DUMP_ENUMS #undef DUMP_ENUMS
#ifndef NODUMPENUMS #ifndef NODUMPENUMS
static void static void
@@ -1160,14 +1168,16 @@ dump_enums(void)
objclass_defchars_enum, objclass_defchars_enum,
objclass_classes_enum, objclass_classes_enum,
objclass_syms_enum, objclass_syms_enum,
arti_enum,
NUM_ENUM_DUMPS NUM_ENUM_DUMPS
}; };
static const char *const titles[NUM_ENUM_DUMPS] = { static const char *const titles[NUM_ENUM_DUMPS] = {
"monnums", "objects_nums" , "misc_object_nums", "monnums", "objects_nums" , "misc_object_nums",
"cmap_symbols", "mon_syms", "mon_defchars", "cmap_symbols", "mon_syms", "mon_defchars",
"objclass_defchars", "objclass_classes", "objclass_defchars", "objclass_classes",
"objclass_syms", "objclass_syms", "artifacts_nums",
}; };
#define dump_om(om) { om, #om } #define dump_om(om) { om, #om }
static const struct enum_dump omdump[] = { static const struct enum_dump omdump[] = {
dump_om(LAST_GENERIC), dump_om(LAST_GENERIC),
@@ -1194,19 +1204,21 @@ dump_enums(void)
objclass_defchars_dump, objclass_defchars_dump,
objclass_classes_dump, objclass_classes_dump,
objclass_syms_dump, objclass_syms_dump,
arti_enum_dump,
}; };
static const char *const pfx[NUM_ENUM_DUMPS] = { "PM_", "", "", static const char *const pfx[NUM_ENUM_DUMPS] = { "PM_", "", "",
"", "", "", "", "", "", "", "",
"", "" }; "", "", "" };
/* 0 = dump numerically only, 1 = add 'char' comment */ /* 0 = dump numerically only, 1 = add 'char' comment */
static const int dumpflgs[NUM_ENUM_DUMPS] = { 0, 0, 0, 0, 0, 1, 1, 0, 0}; static const int dumpflgs[NUM_ENUM_DUMPS] = { 0, 0, 0, 0, 0, 1, 1, 0, 0, 0 };
static int szd[NUM_ENUM_DUMPS] = { SIZE(monsdump), SIZE(objdump), static int szd[NUM_ENUM_DUMPS] = { SIZE(monsdump), SIZE(objdump),
SIZE(omdump), SIZE(defsym_cmap_dump), SIZE(omdump), SIZE(defsym_cmap_dump),
SIZE(defsym_mon_syms_dump), SIZE(defsym_mon_syms_dump),
SIZE(defsym_mon_defchars_dump), SIZE(defsym_mon_defchars_dump),
SIZE(objclass_defchars_dump), SIZE(objclass_defchars_dump),
SIZE(objclass_classes_dump), SIZE(objclass_classes_dump),
SIZE(objclass_syms_dump) SIZE(objclass_syms_dump),
SIZE(arti_enum_dump),
}; };
const char *nmprefix; const char *nmprefix;
int i, j, nmwidth; int i, j, nmwidth;