diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-25 17:30:31 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-25 17:30:31 +0000 |
| commit | 57f3e71ae59d5e4830bdf787d9f2d5e9d5fe8fc8 (patch) | |
| tree | 835d7e23d1c0d27e935015288effd8115a949cf0 /crawl-ref/source/decks.cc | |
| parent | 1f9e38751c81744f2e8d4ffb1aea7f3870ba9d5b (diff) | |
| download | crawl-ref-57f3e71ae59d5e4830bdf787d9f2d5e9d5fe8fc8.tar.gz crawl-ref-57f3e71ae59d5e4830bdf787d9f2d5e9d5fe8fc8.zip | |
In ouch(), use NON_MONSTER instead of 0 as the index for non-monster
attacks, so as to avoid overlap with the first monster on the level.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6985 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 92edae8b0a..8ba664fb9e 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1944,7 +1944,10 @@ static void _focus_card(int power, deck_rarity_type rarity) for (int i = 0; i < 3; ++i) if (*max_statp[i] < 1 || *base_statp[i] < 1) - ouch(INSTANT_DEATH, 0, kill_types[i], cause.c_str(), true); + { + ouch(INSTANT_DEATH, NON_MONSTER, kill_types[i], cause.c_str(), + true); + } // The player survived! Yay! you.redraw_strength = true; @@ -2001,7 +2004,10 @@ static void _shuffle_card(int power, deck_rarity_type rarity) for (int i = 0; i < 3; ++i) if (new_base[i] < 1 || new_max[i] < 1) - ouch(INSTANT_DEATH, 0, kill_types[i], cause.c_str(), true); + { + ouch(INSTANT_DEATH, NON_MONSTER, kill_types[i], cause.c_str(), + true); + } // The player survived! |