Merge branch 'NetHack-3.6.2'

include/hack.h

@@ -1,4 +1,4 @@
-/* NetHack 3.6	hack.h	$NHDT-Date: 1525012595 2018/04/29 14:36:35 $  $NHDT-Branch: master $:$NHDT-Revision: 1.82 $ */
+/* NetHack 3.6	hack.h	$NHDT-Date: 1547514631 2019/01/15 01:10:31 $  $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.101 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Pasi Kallinen, 2017. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -34,11 +34,11 @@
 /* symbolic names for capacity levels */
 enum encumbrance_types {
     UNENCUMBERED = 0,
-    SLT_ENCUMBER, /* Burdened */
-    MOD_ENCUMBER, /* Stressed */
-    HVY_ENCUMBER, /* Strained */
-    EXT_ENCUMBER, /* Overtaxed */
-    OVERLOADED    /* Overloaded */
+    SLT_ENCUMBER = 1, /* Burdened */
+    MOD_ENCUMBER = 2, /* Stressed */
+    HVY_ENCUMBER = 3, /* Strained */
+    EXT_ENCUMBER = 4, /* Overtaxed */
+    OVERLOADED   = 5  /* Overloaded */
 };
 
 /* weight increment of heavy iron ball */
@@ -55,13 +55,13 @@ enum encumbrance_types {
 
 /* hunger states - see hu_stat in eat.c */
 enum hunger_state_types {
-    SATIATED = 0,
-    NOT_HUNGRY,
-    HUNGRY,
-    WEAK,
-    FAINTING,
-    FAINTED,
-    STARVED
+    SATIATED   = 0,
+    NOT_HUNGRY = 1,
+    HUNGRY     = 2,
+    WEAK       = 3,
+    FAINTING   = 4,
+    FAINTED    = 5,
+    STARVED    = 6
 };
 
 /* Macros for how a rumor was delivered in outrumor() */
@@ -72,13 +72,13 @@ enum hunger_state_types {
 
 /* Macros for why you are no longer riding */
 enum dismount_types {
-    DISMOUNT_GENERIC = 0,
-    DISMOUNT_FELL,
-    DISMOUNT_THROWN,
-    DISMOUNT_POLY,
-    DISMOUNT_ENGULFED,
-    DISMOUNT_BONES,
-    DISMOUNT_BYCHOICE
+    DISMOUNT_GENERIC  = 0,
+    DISMOUNT_FELL     = 1,
+    DISMOUNT_THROWN   = 2,
+    DISMOUNT_POLY     = 3,
+    DISMOUNT_ENGULFED = 4,
+    DISMOUNT_BONES    = 5,
+    DISMOUNT_BYCHOICE = 6
 };
 
 /* Special returns from mapglyph() */
@@ -99,25 +99,25 @@ enum dismount_types {
 
 /* alteration types--keep in synch with costly_alteration(mkobj.c) */
 enum cost_alteration_types {
-    COST_CANCEL = 0,   /* standard cancellation */
-    COST_DRAIN,    /* drain life upon an object */
-    COST_UNCHRG,   /* cursed charging */
-    COST_UNBLSS,   /* unbless (devalues holy water) */
-    COST_UNCURS,   /* uncurse (devalues unholy water) */
-    COST_DECHNT,   /* disenchant weapons or armor */
-    COST_DEGRD,    /* removal of rustproofing, dulling via engraving */
-    COST_DILUTE,   /* potion dilution */
-    COST_ERASE,    /* scroll or spellbook blanking */
-    COST_BURN,     /* dipped into flaming oil */
-    COST_NUTRLZ,   /* neutralized via unicorn horn */
-    COST_DSTROY,   /* wand breaking (bill first, useup later) */
-    COST_SPLAT,    /* cream pie to own face (ditto) */
-    COST_BITE,     /* start eating food */
-    COST_OPEN,     /* open tin */
-    COST_BRKLCK,   /* break box/chest's lock */
-    COST_RUST,     /* rust damage */
-    COST_ROT,      /* rotting attack */
-    COST_CORRODE   /* acid damage */
+    COST_CANCEL  =  0, /* standard cancellation */
+    COST_DRAIN   =  1, /* drain life upon an object */
+    COST_UNCHRG  =  2, /* cursed charging */
+    COST_UNBLSS  =  3, /* unbless (devalues holy water) */
+    COST_UNCURS  =  4, /* uncurse (devalues unholy water) */
+    COST_DECHNT  =  5, /* disenchant weapons or armor */
+    COST_DEGRD   =  6, /* removal of rustproofing, dulling via engraving */
+    COST_DILUTE  =  7, /* potion dilution */
+    COST_ERASE   =  8, /* scroll or spellbook blanking */
+    COST_BURN    =  9, /* dipped into flaming oil */
+    COST_NUTRLZ  = 10, /* neutralized via unicorn horn */
+    COST_DSTROY  = 11, /* wand breaking (bill first, useup later) */
+    COST_SPLAT   = 12, /* cream pie to own face (ditto) */
+    COST_BITE    = 13, /* start eating food */
+    COST_OPEN    = 14, /* open tin */
+    COST_BRKLCK  = 15, /* break box/chest's lock */
+    COST_RUST    = 16, /* rust damage */
+    COST_ROT     = 17, /* rotting attack */
+    COST_CORRODE = 18 /* acid damage */
 };
 
 /* bitmask flags for corpse_xname();
@@ -132,9 +132,9 @@ enum cost_alteration_types {
 /* getpos() return values */
 enum getpos_retval {
     LOOK_TRADITIONAL = 0, /* '.' -- ask about "more info?" */
-    LOOK_QUICK,           /* ',' -- skip "more info?" */
-    LOOK_ONCE,            /* ';' -- skip and stop looping */
-    LOOK_VERBOSE          /* ':' -- show more info w/o asking */
+    LOOK_QUICK       = 1, /* ',' -- skip "more info?" */
+    LOOK_ONCE        = 2, /* ';' -- skip and stop looping */
+    LOOK_VERBOSE     = 3  /* ':' -- show more info w/o asking */
 };
 
 /*
@@ -143,22 +143,22 @@ enum getpos_retval {
  * code assume that PANIC separates the deaths from the non-deaths.
  */
 enum game_end_types {
-    DIED = 0,
-    CHOKING,
-    POISONING,
-    STARVING,
-    DROWNING,
-    BURNING,
-    DISSOLVED,
-    CRUSHING,
-    STONING,
-    TURNED_SLIME,
-    GENOCIDED,
-    PANICKED,
-    TRICKED,
-    QUIT,
-    ESCAPED,
-    ASCENDED
+    DIED         =  0,
+    CHOKING      =  1,
+    POISONING    =  2,
+    STARVING     =  3,
+    DROWNING     =  4,
+    BURNING      =  5,
+    DISSOLVED    =  6,
+    CRUSHING     =  7,
+    STONING      =  8,
+    TURNED_SLIME =  9,
+    GENOCIDED    = 10,
+    PANICKED     = 11,
+    TRICKED      = 12,
+    QUIT         = 13,
+    ESCAPED      = 14,
+    ASCENDED     = 15
 };
 
 typedef struct strbuf {
@@ -218,21 +218,21 @@ typedef struct {
 
 /* types of calls to bhit() */
 enum bhit_call_types {
-    ZAPPED_WAND = 0,
-    THROWN_WEAPON,
-    THROWN_TETHERED_WEAPON,
-    KICKED_WEAPON,
-    FLASHED_LIGHT,
-    INVIS_BEAM
+    ZAPPED_WAND   = 0,
+    THROWN_WEAPON = 1,
+    THROWN_TETHERED_WEAPON = 2,
+    KICKED_WEAPON = 3,
+    FLASHED_LIGHT = 4,
+    INVIS_BEAM    = 5
 };
 
 /* attack mode for hmon() */
 enum hmon_atkmode_types {
-    HMON_MELEE = 0, /* hand-to-hand */
-    HMON_THROWN,    /* normal ranged (or spitting while poly'd) */
-    HMON_KICKED,    /* alternate ranged */
-    HMON_APPLIED,   /* polearm, treated as ranged */
-    HMON_DRAGGED    /* attached iron ball, pulled into mon */
+    HMON_MELEE   = 0, /* hand-to-hand */
+    HMON_THROWN  = 1, /* normal ranged (or spitting while poly'd) */
+    HMON_KICKED  = 2, /* alternate ranged */
+    HMON_APPLIED = 3, /* polearm, treated as ranged */
+    HMON_DRAGGED = 4  /* attached iron ball, pulled into mon */
 };
 
 /* sortloot() return type; needed before extern.h */
@@ -401,14 +401,14 @@ typedef struct sortloot_item Loot;
 
 /* Macros for explosion types */
 enum explosion_types {
-    EXPL_DARK = 0,
-    EXPL_NOXIOUS,
-    EXPL_MUDDY,
-    EXPL_WET,
-    EXPL_MAGICAL,
-    EXPL_FIERY,
-    EXPL_FROSTY,
-    EXPL_MAX
+    EXPL_DARK    = 0,
+    EXPL_NOXIOUS = 1,
+    EXPL_MUDDY   = 2,
+    EXPL_WET     = 3,
+    EXPL_MAGICAL = 4,
+    EXPL_FIERY   = 5,
+    EXPL_FROSTY  = 6,
+    EXPL_MAX     = 7
 };
 
 /* enlightenment control flags */
@@ -439,25 +439,25 @@ enum explosion_types {
 
 /* Macros for messages referring to hands, eyes, feet, etc... */
 enum bodypart_types {
-    ARM = 0,
-    EYE,
-    FACE,
-    FINGER,
-    FINGERTIP,
-    FOOT,
-    HAND,
-    HANDED,
-    HEAD,
-    LEG,
-    LIGHT_HEADED,
-    NECK,
-    SPINE,
-    TOE,
-    HAIR,
-    BLOOD,
-    LUNG,
-    NOSE,
-    STOMACH
+    ARM       =  0,
+    EYE       =  1,
+    FACE      =  2,
+    FINGER    =  3,
+    FINGERTIP =  4,
+    FOOT      =  5,
+    HAND      =  6,
+    HANDED    =  7,
+    HEAD      =  8,
+    LEG       =  9,
+    LIGHT_HEADED = 10,
+    NECK      = 11,
+    SPINE     = 12,
+    TOE       = 13,
+    HAIR      = 14,
+    BLOOD     = 15,
+    LUNG      = 16,
+    NOSE      = 17,
+    STOMACH   = 18
 };
 
 /* indices for some special tin types */