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/hiscores.cc | |
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/hiscores.cc')
-rw-r--r-- | crawl-ref/source/hiscores.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 1ef0bb6e19..cd28adc53e 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -942,8 +942,8 @@ void scorefile_entry::init_death_cause(int dam, int dsrc, { const monsters *monster = &menv[death_source]; - if (monster->type > 0 || monster->type <= NUM_MONSTERS) - { + if (monster->type >= 0 && monster->type < NUM_MONSTERS) + { death_source = monster->type; mon_num = monster->number; |