summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/actor.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/actor.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/actor.h')
-rw-r--r--crawl-ref/source/actor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/actor.h b/crawl-ref/source/actor.h
index 2f46aff6aa..50750abee6 100644
--- a/crawl-ref/source/actor.h
+++ b/crawl-ref/source/actor.h
@@ -181,7 +181,7 @@ public:
virtual int res_negative_energy() const = 0;
virtual int res_torment() const = 0;
virtual int res_magic() const = 0;
- virtual bool check_res_magic(int power) = 0;
+ virtual bool check_res_magic(int power);
virtual flight_type flight_mode() const = 0;
virtual bool is_levitating() const = 0;