Merge branch 'master' into unified_combat_control

Conflicts:
	crawl-ref/source/Makefile.obj
	crawl-ref/source/dbg-scan.cc
	crawl-ref/source/decks.cc
	crawl-ref/source/describe.cc
	crawl-ref/source/directn.cc
	crawl-ref/source/evoke.cc
	crawl-ref/source/fight.cc
	crawl-ref/source/fight.h
	crawl-ref/source/ghost.cc
	crawl-ref/source/ghost.h
	crawl-ref/source/item_use.cc
	crawl-ref/source/items.cc
	crawl-ref/source/map_knowledge.cc
	crawl-ref/source/melee_attack.h
	crawl-ref/source/mon-abil.cc
	crawl-ref/source/mon-act.cc
	crawl-ref/source/mon-stuff.cc
	crawl-ref/source/monster.cc
	crawl-ref/source/monster.h
	crawl-ref/source/player.cc
	crawl-ref/source/player.h
	crawl-ref/source/shopping.cc
	crawl-ref/source/spl-damage.cc
	crawl-ref/source/spl-summoning.cc
	crawl-ref/source/spl-transloc.cc
	crawl-ref/source/stairs.cc
	crawl-ref/source/stuff.cc
	crawl-ref/source/tags.cc
	crawl-ref/source/traps.cc
	crawl-ref/source/xom.cc

1 files changed, 12 insertions, 4 deletions

diff --git a/crawl-ref/source/directn.h b/crawl-ref/source/directn.h
index 004bb4c8f6..bdcf92ca6a 100644
--- a/crawl-ref/source/directn.h
+++ b/crawl-ref/source/directn.h
@@ -17,7 +17,7 @@
 class range_view_annotator
 {
 public:
-    range_view_annotator(int range);
+    range_view_annotator(targetter *range);
     virtual ~range_view_annotator();
 };
 
@@ -40,12 +40,15 @@ public:
     // Update the prompt shown at top.
     virtual void update_top_prompt(std::string* p_top_prompt) {}
 
+    // Add relevant descriptions to the target status.
+    virtual std::vector<std::string> get_monster_desc(const monster_info& mi);
  private:
     std::string prompt;
 
 public:
     bool just_looking;
     bool compass;
+    desc_filter get_desc_func; // Function to add relevant descriptions
 };
 
 // output from direction() function:
@@ -82,6 +85,7 @@ struct direction_chooser_args
     targeting_behaviour *behaviour;
     bool cancel_at_self;
     bool show_floor_desc;
+    desc_filter get_desc_func;
 
     direction_chooser_args() :
         hitfunc(NULL),
@@ -95,7 +99,8 @@ struct direction_chooser_args
         target_prefix(NULL),
         behaviour(NULL),
         cancel_at_self(false),
-        show_floor_desc(false) {}
+        show_floor_desc(false),
+        get_desc_func(NULL) {}
 };
 
 class direction_chooser
@@ -139,6 +144,9 @@ private:
     bool select_compass_direction(const coord_def& delta);
     bool select_previous_target();
 
+    // Mark item for pickup, initiate movement.
+    bool pickup_item();
+
     // Return true if we need to abort targeting due to a signal.
     bool handle_signals();
 
@@ -264,7 +272,7 @@ enum mons_equip_desc_level_type
     DESC_IDENTIFIED,
 };
 
-#ifndef USE_TILE
+#ifndef USE_TILE_LOCAL
 char mlist_index_to_letter(int index);
 #endif
 
@@ -313,6 +321,6 @@ std::vector<dungeon_feature_type> features_by_desc(const base_pattern &pattern);
 
 void full_describe_view(void);
 
-extern const struct coord_def Compass[8];
+extern const struct coord_def Compass[9];
 
 #endif