Merge branch 'master' into unified_combat_control

Conflicts:
	crawl-ref/source/actor.cc
	crawl-ref/source/delay.cc
	crawl-ref/source/directn.cc
	crawl-ref/source/directn.h
	crawl-ref/source/fight.cc
	crawl-ref/source/files.cc
	crawl-ref/source/mon-act.cc
	crawl-ref/source/monster.cc
	crawl-ref/source/mpr.h
	crawl-ref/source/player.cc
	crawl-ref/source/shopping.cc

1 files changed, 14 insertions, 6 deletions

diff --git a/crawl-ref/source/directn.h b/crawl-ref/source/directn.h
index e2a53d481e..004bb4c8f6 100644
--- a/crawl-ref/source/directn.h
+++ b/crawl-ref/source/directn.h
@@ -1,8 +1,7 @@
-/*
- *  File:       directn.h
- *  Summary:    Functions used when picking squares.
- *  Written by: Linley Henzell
- */
+/**
+ * @file
+ * @brief Functions used when picking squares.
+**/
 
 
 #ifndef DIRECT_H
@@ -257,6 +256,14 @@ private:
 
 };
 
+// Monster equipment description level.
+enum mons_equip_desc_level_type
+{
+    DESC_WEAPON,
+    DESC_FULL,
+    DESC_IDENTIFIED,
+};
+
 #ifndef USE_TILE
 char mlist_index_to_letter(int index);
 #endif
@@ -276,7 +283,8 @@ void get_square_desc(const coord_def &c, describe_info &inf,
 
 void describe_floor();
 std::string get_monster_equipment_desc(const monster_info& mi,
-                                bool full_desc = true,
+                                //bool full_desc = true,
+                                mons_equip_desc_level_type level = DESC_FULL,
                                 description_level_type mondtype = DESC_A,
                                 bool print_attitude = false);