diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 02:11:22 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-03 02:11:22 +0000 |
| commit | a9e569676b6f624bd1f24497d52e92b9f38ec366 (patch) | |
| tree | 0947717f6cbb1628e95c8622542a8ec4683f8f33 /crawl-ref/source/mon-util.cc | |
| parent | 10600478b36cdc29c388fe36505da3176dc575ba (diff) | |
| download | crawl-ref-a9e569676b6f624bd1f24497d52e92b9f38ec366.tar.gz crawl-ref-a9e569676b6f624bd1f24497d52e92b9f38ec366.zip | |
Fix assertion failure (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8151 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-util.cc')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 2fb8f6d226..51d845c9b8 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1064,7 +1064,7 @@ int mons_damage(int mc, int rt) bool mons_immune_magic(const monsters *mon) { - return get_monster_data(mon->type)->resist_magic == MAG_IMMUNE; + return (get_monster_data(mon->type)->resist_magic == MAG_IMMUNE); } int mons_resist_magic( const monsters *mon ) @@ -2206,7 +2206,7 @@ bool give_monster_proper_name(monsters *mon, bool orcs_only) // See mons_init for initialization of mon_entry array. monsterentry *get_monster_data(int p_monsterid) { - if (p_monsterid > 0 && p_monsterid < NUM_MONSTERS) + if (p_monsterid >= 0 && p_monsterid < NUM_MONSTERS) return (&mondata[mon_entry[p_monsterid]]); else return (NULL); |