summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/monster.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-11-05 15:24:46 +0100
committerAdam Borowski <kilobyte@angband.pl>2009-11-05 15:24:46 +0100
commit8a71b54ce2a022bdd79680e19f88d9c600a0fc4e (patch)
tree659e82ce2a598331ffc14fb7e07a054dae11ce04 /crawl-ref/source/monster.h
parent329209bca2c5cf2b32fe7cffc12ced1151200043 (diff)
downloadcrawl-ref-8a71b54ce2a022bdd79680e19f88d9c600a0fc4e.tar.gz
crawl-ref-8a71b54ce2a022bdd79680e19f88d9c600a0fc4e.zip
Merge monsters,player::check_res_magic() (Zaba)
Diffstat (limited to 'crawl-ref/source/monster.h')
-rw-r--r--crawl-ref/source/monster.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/crawl-ref/source/monster.h b/crawl-ref/source/monster.h
index 0528163fe4..cba8bce535 100644
--- a/crawl-ref/source/monster.h
+++ b/crawl-ref/source/monster.h
@@ -308,7 +308,6 @@ public:
int res_torment() const;
int res_acid() const;
int res_magic() const;
- bool check_res_magic(int power);
flight_type flight_mode() const;
bool is_levitating() const;