diff options
author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
---|---|---|
committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-04-05 16:46:35 +0000 |
commit | 8b6403164380ecbc2a0a16b15757fd2cdce548eb (patch) | |
tree | 2f6d8bf84b4be0b82aad5ef055516e758e505b16 /crawl-ref/source/mon-util.h | |
parent | cd9d13b92dee71ff7671c10e69e4508b7554ff69 (diff) | |
download | crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.tar.gz crawl-ref-8b6403164380ecbc2a0a16b15757fd2cdce548eb.zip |
Merge trunk back into 0.2 for 0.2.2.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1227 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.h')
-rw-r--r-- | crawl-ref/source/mon-util.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index f35f9cce2f..1317bf983a 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -271,7 +271,7 @@ int mons_res_fire( const monsters *mon ); * called from: beam - monstuff - spells4 * *********************************************************************** */ int mons_res_poison( const monsters *mon ); - +int mons_res_acid( const monsters *mon ); int mons_res_negative_energy( const monsters *mon ); bool mons_res_asphyx( const monsters *mon ); |