From 1d0f57cbceb778139ca215cc4fcfd1584951f6dd Mon Sep 17 00:00:00 2001
From: dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>
Date: Wed, 22 Nov 2006 08:41:20 +0000
Subject: 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
---
 crawl-ref/source/monstuff.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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

diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h
index f6202f23ae..dbbb85aeae 100644
--- a/crawl-ref/source/monstuff.h
+++ b/crawl-ref/source/monstuff.h
@@ -3,6 +3,8 @@
  *  Summary:    Misc monster related functions.
  *  Written by: Linley Henzell
  *
+ *  Modified for Crawl Reference by $Author$ on $Date$
+ *
  *  Change History (most recent first):
  *
  *               <1>     -/--/--        LRH             Created
@@ -16,6 +18,8 @@
 // useful macro
 #define SAME_ATTITUDE(x) (mons_friendly(x)?BEH_FRIENDLY:BEH_HOSTILE)
 
+#define MONST_INTERESTING(x) (x->flags & MF_INTERESTING)
+
 // for definition of type monsters {dlb}
 #include "externs.h"
 // for definition of type monsters {dlb}
@@ -65,7 +69,7 @@ bool curse_an_item(char which, char power);
 /* ***********************************************************************
  * called from: fight
  * *********************************************************************** */
-void monster_blink(struct monsters *monster);
+bool monster_blink(struct monsters *monster);
 
 
 /* ***********************************************************************
@@ -131,7 +135,7 @@ bool message_current_target(void);
 /* ***********************************************************************
  * called from: xxx
  * *********************************************************************** */
-unsigned int monster_index(struct monsters *monster);
+unsigned int monster_index(const monsters *monster);
 
 
 // last updated 08jun2000 {dlb}
@@ -147,5 +151,11 @@ bool hurt_monster(struct monsters *victim, int damage_dealt);
  * *********************************************************************** */
 bool heal_monster(struct monsters *patient, int health_boost, bool permit_growth);
 
+/* ***********************************************************************
+ * called from: monplace - spells2 - view
+ * *********************************************************************** */
+void seen_monster(struct monsters *monster);
+
+bool shift_monster( struct monsters *mon, int x = 0, int y = 0 );
 
 #endif
-- 
cgit v1.2.3-54-g00ecf