Integrated travel patch as of 20060727

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 104 insertions, 1 deletions

diff --git a/trunk/source/enum.h b/trunk/source/enum.h
index a1b76e0422..1306540f2b 100644
--- a/trunk/source/enum.h
+++ b/trunk/source/enum.h
@@ -126,6 +126,42 @@ enum ABILITY_FLAGS
     ABFLAG_PERMANENT_MP = 0x00000040  // costs permanent MPs
 };
 
+enum ACTIVITY
+{
+    ACT_NONE        = 0,
+    ACT_MULTIDROP,
+    ACT_RUNNING,
+    ACT_TRAVELING,
+    ACT_MACRO,
+
+    ACT_ACTIVITY_COUNT
+};
+
+enum ACT_INTERRUPT
+{
+    AI_FORCE_INTERRUPT = 0,         // Forcibly kills any activity
+    AI_KEYPRESS = 0x01,
+    AI_FULL_HP  = 0x02,             // Player is fully healed
+    AI_FULL_MP  = 0x04,             // Player has recovered all mp
+    AI_STATUE   = 0x08,             // Bad statue has come into view
+    AI_HUNGRY   = 0x10,             // Hunger increased
+    AI_MESSAGE  = 0x20,             // Message was displayed
+    AI_HP_LOSS  = 0x40,
+    AI_BURDEN_CHANGE = 0x80,
+    AI_STAT_CHANGE = 0x100,
+    AI_SEE_MONSTER = 0x200,
+    AI_TELEPORT    = 0x400,
+};
+
+enum AI_PAYLOAD
+{
+    AIP_NONE,
+    AIP_INT,
+    AIP_STRING,
+    AIP_MONSTER,
+    AIP_HP_LOSS,
+};
+
 enum AMMUNITION_DESCRIPTIONS
 {
     DAMMO_ORCISH = 3,                  //    3
@@ -133,6 +169,21 @@ enum AMMUNITION_DESCRIPTIONS
     DAMMO_DWARVEN                      //    5
 };
 
+// Various ways to get the acquirement effect.
+enum AQ_AGENTS
+{
+    AQ_SCROLL   = 0,
+    
+    // Empty space for the gods
+    
+    AQ_CARD_ACQUISITION = 100,
+    AQ_CARD_VIOLENCE,
+    AQ_CARD_PROTECTION,
+    AQ_CARD_KNOWLEDGE,
+
+    AQ_WIZMODE          = 200,
+};
+
 enum ARMOUR
 {
     ARM_ROBE,                          //    0
@@ -545,7 +596,16 @@ enum COMMANDS
     CMD_QUIT,
     CMD_WIZARD,
     CMD_DESTROY_ITEM,
-    CMD_OBSOLETE_INVOKE
+    CMD_OBSOLETE_INVOKE,
+
+    CMD_MARK_STASH,
+    CMD_FORGET_STASH,
+    CMD_SEARCH_STASHES,
+    CMD_EXPLORE,
+    CMD_INTERLEVEL_TRAVEL,
+    CMD_FIX_WAYPOINT,
+
+    CMD_CLEAR_MAP,
 };
 
 enum CONFIRM_LEVEL
@@ -645,6 +705,12 @@ enum DIRECTION                         // (unsigned char) you.char_direction
     DIR_ASCENDING = 1   //    1 - change and lose savefile compatibility (!!!)
 };
 
+enum DROP_MODE
+{
+    DM_SINGLE,
+    DM_MULTI
+};
+
 enum DUNGEON_FEATURES                  // (unsigned char) grd[][]
 {
     DNGN_UNSEEN,                       //    0
@@ -904,6 +970,7 @@ enum FLUSH_REASONS
     FLUSH_ON_FAILURE,                  // spell/ability failed to cast
     FLUSH_BEFORE_COMMAND,              // flush before getting a command
     FLUSH_ON_MESSAGE,                  // flush when printing a message
+    FLUSH_LUA,                         // flush when Lua wants us to
     NUM_FLUSH_REASONS
 };
 
@@ -1116,6 +1183,8 @@ enum ITEM_STATUS_FLAGS      // per item flags: ie. ident status, cursed status
     ISFLAG_RANDART           = 0x00001000,  // special value is seed
     ISFLAG_UNRANDART         = 0x00002000,  // is an unrandart
     ISFLAG_ARTEFACT_MASK     = 0x00003000,  // randart or unrandart
+    ISFLAG_DROPPED           = 0x00004000,  // dropped item (no autopickup)
+    ISFLAG_THROWN            = 0x00008000,  // thrown missile weapon
 
     ISFLAG_NO_DESC           = 0x00000000,  // used for clearing these flags
     ISFLAG_GLOWING           = 0x00010000,  // weapons or armour
@@ -1151,6 +1220,20 @@ enum ITEM_MAKE_SPECIES                  // used only for race during creation
     MAKE_ITEM_RANDOM_RACE = 250
 };
 
+enum ITEM_ORIGIN_DUMP_SELECT
+{
+    IODS_PRICE            = 0,      // Extra info is provided based on price
+    IODS_ARTIFACTS        = 1,      // Extra information on artifacts
+    IODS_EGO_ARMOUR       = 2,
+    IODS_EGO_WEAPON       = 4,
+    IODS_JEWELLERY        = 8,
+    IODS_RUNES            = 16,
+    IODS_RODS             = 32,
+    IODS_STAVES           = 64,
+    IODS_BOOKS            = 128,
+    IODS_EVERYTHING       = 0xFF
+};
+
 enum ITEM_TYPE_ID       // used for first index of id[4][50]
 {
     IDTYPE_WANDS = 0,
@@ -1276,6 +1359,14 @@ enum KILLBY
     NUM_KILLBY
 };
 
+enum KillCategory
+{
+    KC_YOU,
+    KC_FRIENDLY,
+    KC_OTHER,
+    KC_NCATEGORIES
+};
+
 enum KILLER                            // monster_die(), thing_thrown
 {
     KILL_YOU = 1,                      //    1
@@ -2153,6 +2244,12 @@ enum OBJECT_CLASSES                    // (unsigned char) mitm[].base_type
                      // for blanket random sub_type .. see dungeon::items()
 };
 
+enum OBJECT_SELECTORS
+{
+    OSEL_ANY   = -1,
+    OSEL_WIELD = -2,
+};
+
 enum ORBS
 {
     ORB_ZOT                            //    0
@@ -2762,6 +2859,12 @@ enum SPELL_TYPES //jmf: 24jul2000: changed from integer-list to bitfield
   SPTYP_RANDOM         = 1<<14
 };
 
+enum SLOT_SELECT_MODES
+{
+    SS_FORWARD      = 0,
+    SS_BACKWARD     = 1,
+};
+
 enum STATS
 {
   STAT_STRENGTH,                     //    0