Backported combat grammar fixes for mimic attack shield blocks to 0.2.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1405 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 4 insertions, 3 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index c3ab663dc0..6bdf8f1562 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -642,9 +642,9 @@ public:
 
   KillMaster kills;
 
-  char level_type;
+  level_area_type level_type;
 
-  char where_are_you;
+  branch_type where_are_you;
 
   FixedVector<unsigned char, 30> branch_stairs;
 
@@ -924,7 +924,7 @@ public:
     void timeout_enchantments(int levels);
     
     bool needs_transit() const;
-    void set_transit(level_id destination);
+    void set_transit(const level_id &destination);
     bool find_place_to_live(bool near_player = false);
     bool find_place_near_player();
     bool find_home_in(coord_def s, coord_def e);
@@ -1121,6 +1121,7 @@ public:
 private:
     static int n_extra_ghosts();
     static void find_extra_ghosts(std::vector<ghost_demon> &ghosts, int n);
+    static void announce_ghost(const ghost_demon &g);
     
 private:
     void add_spells();