more enums with explicit values

As before, it's an aid to finding things if you're looking for something
by its numeric value.
This commit is contained in:
PatR
2019-01-13 17:19:39 -08:00
parent d735d04b5b
commit 64821f4ad5
3 changed files with 84 additions and 83 deletions
+9 -9
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 mextra.h $NHDT-Date: 1451836000 2016/01/03 15:46:40 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.18 $ */ /* NetHack 3.6 mextra.h $NHDT-Date: 1547428759 2019/01/14 01:19:19 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.22 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -144,16 +144,16 @@ struct emin {
/*** /***
** formerly edog.h -- pet extension ** formerly edog.h -- pet extension
*/ */
/* various types of pet food, the lower, the better liked */ /* various types of pet food, the lower the value, the better liked */
enum dogfood_types { enum dogfood_types {
DOGFOOD = 0, DOGFOOD = 0,
CADAVER, CADAVER = 1,
ACCFOOD, ACCFOOD = 2,
MANFOOD, MANFOOD = 3,
APPORT, APPORT = 4,
POISON, POISON = 5,
UNDEF, UNDEF = 6,
TABU TABU = 7
}; };
struct edog { struct edog {
+13 -12
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 monst.h $NHDT-Date: 1461028522 2016/04/19 01:15:22 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.24 $ */ /* NetHack 3.6 monst.h $NHDT-Date: 1547428769 2019/01/14 01:19:29 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.27 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2016. */ /*-Copyright (c) Robert Patrick Rankin, 2016. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -21,13 +21,13 @@
* weapon that this is impractical. --KAA * weapon that this is impractical. --KAA
*/ */
enum wpn_chk_flags { enum wpn_chk_flags {
NO_WEAPON_WANTED = 0, NO_WEAPON_WANTED = 0,
NEED_WEAPON, NEED_WEAPON = 1,
NEED_RANGED_WEAPON, NEED_RANGED_WEAPON = 2,
NEED_HTH_WEAPON, NEED_HTH_WEAPON = 3,
NEED_PICK_AXE, NEED_PICK_AXE = 4,
NEED_AXE, NEED_AXE = 5,
NEED_PICK_OR_AXE NEED_PICK_OR_AXE = 6
}; };
/* The following flags are used for the second argument to display_minventory /* The following flags are used for the second argument to display_minventory
@@ -42,11 +42,12 @@ enum wpn_chk_flags {
#define MINV_NOLET 0x04 #define MINV_NOLET 0x04
#define MINV_ALL 0x08 #define MINV_ALL 0x08
/* monster appearance types */
enum m_ap_types { enum m_ap_types {
M_AP_NOTHING = 0, /* mappearance unused--monster appears as itself */ M_AP_NOTHING = 0, /* mappearance unused--monster appears as itself */
M_AP_FURNITURE, /* stairs, a door, an altar, etc. */ M_AP_FURNITURE = 1, /* stairs, a door, an altar, etc. */
M_AP_OBJECT, /* an object */ M_AP_OBJECT = 2, /* an object */
M_AP_MONSTER /* a monster */ M_AP_MONSTER = 3 /* a monster; mostly used for cloned Wizard */
}; };
struct monst { struct monst {
+62 -62
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 monsym.h $NHDT-Date: 1524689515 2018/04/25 20:51:55 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.11 $ */ /* NetHack 3.6 monsym.h $NHDT-Date: 1547428769 2019/01/14 01:19:29 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.12 $ */
/* Copyright (c) 2016 by Pasi Kallinen */ /* Copyright (c) 2016 by Pasi Kallinen */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
/* Monster symbols and creation information rev 1.0 */ /* Monster symbols and creation information rev 1.0 */
@@ -12,69 +12,69 @@
* NULL character. * NULL character.
*/ */
enum mon_class_types { enum mon_class_types {
S_ANT = 1, S_ANT = 1, /* a */
S_BLOB, S_BLOB = 2, /* b */
S_COCKATRICE, S_COCKATRICE = 3, /* c */
S_DOG, S_DOG = 4, /* d */
S_EYE, S_EYE = 5, /* e */
S_FELINE, S_FELINE = 6, /* f: cats */
S_GREMLIN, S_GREMLIN = 7, /* g */
S_HUMANOID, S_HUMANOID = 8, /* h: small humanoids: hobbit, dwarf */
S_IMP, S_IMP = 9, /* i: minor demons */
S_JELLY, S_JELLY = 10, /* j */
S_KOBOLD, S_KOBOLD = 11, /* k */
S_LEPRECHAUN, S_LEPRECHAUN = 12, /* l */
S_MIMIC, S_MIMIC = 13, /* m */
S_NYMPH, S_NYMPH = 14, /* n */
S_ORC, S_ORC = 15, /* o */
S_PIERCER, S_PIERCER = 16, /* p */
S_QUADRUPED, S_QUADRUPED = 17, /* q: excludes horses */
S_RODENT, S_RODENT = 18, /* r */
S_SPIDER, S_SPIDER = 19, /* s */
S_TRAPPER, S_TRAPPER = 20, /* t */
S_UNICORN, S_UNICORN = 21, /* u: includes horses */
S_VORTEX, S_VORTEX = 22, /* v */
S_WORM, S_WORM = 23, /* w */
S_XAN, S_XAN = 24, /* x */
S_LIGHT, S_LIGHT = 25, /* y: yellow light, black light */
S_ZRUTY, S_ZRUTY = 26, /* z */
S_ANGEL, S_ANGEL = 27, /* A */
S_BAT, S_BAT = 28, /* B */
S_CENTAUR, S_CENTAUR = 29, /* C */
S_DRAGON, S_DRAGON = 30, /* D */
S_ELEMENTAL, S_ELEMENTAL = 31, /* E: includes invisible stalker */
S_FUNGUS, S_FUNGUS = 32, /* F */
S_GNOME, S_GNOME = 33, /* G */
S_GIANT, S_GIANT = 34, /* H: large humanoid: giant, ettin, minotaur */
S_invisible, /* non-class present in def_monsyms[] */ S_invisible = 35, /* I: non-class present in def_monsyms[] */
S_JABBERWOCK, S_JABBERWOCK = 36, /* J */
S_KOP, S_KOP = 37, /* K */
S_LICH, S_LICH = 38, /* L */
S_MUMMY, S_MUMMY = 39, /* M */
S_NAGA, S_NAGA = 40, /* N */
S_OGRE, S_OGRE = 41, /* O */
S_PUDDING, S_PUDDING = 42, /* P */
S_QUANTMECH, S_QUANTMECH = 43, /* Q */
S_RUSTMONST, S_RUSTMONST = 44, /* R */
S_SNAKE, S_SNAKE = 45, /* S */
S_TROLL, S_TROLL = 46, /* T */
S_UMBER, S_UMBER = 47, /* U: umber hulk */
S_VAMPIRE, S_VAMPIRE = 48, /* V */
S_WRAITH, S_WRAITH = 49, /* W */
S_XORN, S_XORN = 50, /* X */
S_YETI, S_YETI = 51, /* Y: includes owlbear, monkey */
S_ZOMBIE, S_ZOMBIE = 52, /* Z */
S_HUMAN, S_HUMAN = 53, /* @ */
S_GHOST, S_GHOST = 54, /* <space> */
S_GOLEM, S_GOLEM = 55, /* ' */
S_DEMON, S_DEMON = 56, /* & */
S_EEL, S_EEL = 57, /* ; (fish) */
S_LIZARD, S_LIZARD = 58, /* : (reptiles) */
S_WORM_TAIL, S_WORM_TAIL = 59, /* ~ */
S_MIMIC_DEF, S_MIMIC_DEF = 60, /* ] */
MAXMCLASSES /* number of monster classes */ MAXMCLASSES = 61 /* number of monster classes */
}; };
/* /*