summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monstuff.h
diff options
context:
space:
mode:
authordshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-05-28 08:47:30 +0000
committerdshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573>2007-05-28 08:47:30 +0000
commit20a6609453ee2b51c388c296516c1abc1beab1d2 (patch)
tree201d735a3a4d66471005cb763078a6c05056752c /crawl-ref/source/monstuff.h
parent7aed4c41d7fa0f9d70df56a82abbe69061e56269 (diff)
downloadcrawl-ref-20a6609453ee2b51c388c296516c1abc1beab1d2.tar.gz
crawl-ref-20a6609453ee2b51c388c296516c1abc1beab1d2.zip
Preliminary integration of Zooko's Xom patch (untested).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1489 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.h')
-rw-r--r--crawl-ref/source/monstuff.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h
index cc308c6a77..ec98dbb277 100644
--- a/crawl-ref/source/monstuff.h
+++ b/crawl-ref/source/monstuff.h
@@ -14,6 +14,7 @@
#ifndef MONSTUFF_H
#define MONSTUFF_H
+#include "mon-util.h"
// useful macro
#define SAME_ATTITUDE(x) (mons_friendly(x)?BEH_FRIENDLY:BEH_HOSTILE)
@@ -33,12 +34,13 @@ int get_mimic_colour( const monsters *mimic );
* *********************************************************************** */
void alert_nearby_monsters(void);
-
-// last updated: 08jun2000 {dlb}
-/* ***********************************************************************
- * called from: beam - effects - monstuff
- * *********************************************************************** */
-bool monster_polymorph(struct monsters *monster, int targetc, int power);
+enum poly_power_type {
+ PPT_LESS,
+ PPT_MORE,
+ PPT_SAME
+};
+bool monster_polymorph(monsters *monster, monster_type targetc,
+ poly_power_type p = PPT_SAME);
// last updated: 08jun2000 {dlb}
/* ***********************************************************************