Merged stone_soup r15:451 into trunk.

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

1 files changed, 19 insertions, 0 deletions

diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h
index dedd41ae68..7db4d30569 100644
--- a/crawl-ref/source/dungeon.h
+++ b/crawl-ref/source/dungeon.h
@@ -3,6 +3,8 @@
  *  Summary:    Functions used when building new levels.
  *  Written by: Linley Henzell
  *
+ *  Modified for Crawl Reference by $Author$ on $Date$
+ *
  *  Change History (most recent first):
  *
  *               <1>     -/--/--        LRH             Created
@@ -17,6 +19,14 @@
 
 #define MAKE_GOOD_ITEM          351
 
+// Should be the larger of GXM/GYM
+#define MAP_SIDE  GXM
+
+// This may sometimes be used as map_type[x][y] (for minivaults) and as
+// map_type[y][x] for large-scale vaults. Keep an eye out for the associated
+// brain-damage. [dshaligram]
+typedef char map_type[MAP_SIDE + 1][MAP_SIDE + 1];
+
 void item_colour( item_def &item );
 
 // last updated 12may2000 {dlb}
@@ -46,4 +56,13 @@ void give_item(int mid, int level_number);
  * *********************************************************************** */
 void define_zombie(int mid, int ztype, int cs, int power);
 
+bool is_wall(int feature);
+
+bool place_specific_trap(unsigned char spec_x, unsigned char spec_y,
+                         unsigned char spec_type);
+
+void place_spec_shop(int level_number, unsigned char shop_x,
+                         unsigned char shop_y, unsigned char force_s_type,
+                         bool representative = false );
+
 #endif