From 9b41135da821d07d54c7a6ee75ed6dcbd19e9322 Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 27 Jun 2007 19:42:23 +0000
Subject: Added glyphs_connected and friends for maps to test connectedness of
 points after map transforms are applied.

Fixed conflicts in bison grammar.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1669 c06c8d41-db1a-0410-9941-cceddc491573
---
 crawl-ref/source/externs.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'crawl-ref/source/externs.h')

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index a2ee9c7f01..25ce05cba4 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -340,6 +340,7 @@ struct coord_def
         return (MAXIMUM(::abs(x), ::abs(y)));
     }
 };
+typedef bool (*coord_predicate)(const coord_def &c);
 
 struct dice_def
 {
@@ -1164,6 +1165,7 @@ struct map_cell
     bool seen() const;
 };
 
+typedef FixedArray<dungeon_feature_type, GXM, GYM> feature_grid;
 struct crawl_environment
 {
     unsigned char rock_colour;
@@ -1172,7 +1174,7 @@ struct crawl_environment
     FixedVector< item_def, MAX_ITEMS >       item;  // item list
     FixedVector< monsters, MAX_MONSTERS >    mons;  // monster list
 
-    FixedArray<dungeon_feature_type, GXM, GYM> grid;  // terrain grid
+    feature_grid                             grid;  // terrain grid
     FixedArray< unsigned char, GXM, GYM >    mgrid; // monster grid
     FixedArray< int, GXM, GYM >              igrid; // item grid
     FixedArray< unsigned char, GXM, GYM >    cgrid; // cloud grid
@@ -1286,6 +1288,7 @@ struct system_environment
 #endif
 
     std::string scorefile;
+    std::vector<std::string> cmd_args;
 };
 
 extern system_environment SysEnv;
-- 
cgit v1.2.3-54-g00ecf