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/misc.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/misc.cc')
| -rw-r--r-- | crawl-ref/source/misc.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 26ae1fd3a4..aa9a7c04fd 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1301,7 +1301,7 @@ void curare_hits_player(int agent, int degree) if (hurted) { mpr("You feel difficulty breathing."); - ouch( hurted, agent, KILLED_BY_CURARE, "curare-induced apnoea" ); + ouch(hurted, agent, KILLED_BY_CURARE, "curare-induced apnoea"); } potion_effect(POT_SLOWING, 2 + random2(4 + degree)); } @@ -1488,8 +1488,8 @@ void up_stairs(dungeon_feature_type force_stair, { mpr("In your confused state, you trip and fall back down the stairs."); - ouch( roll_dice( 3 + you.burden_state, 5 ), 0, - KILLED_BY_FALLING_DOWN_STAIRS ); + ouch(roll_dice(3 + you.burden_state, 5), NON_MONSTER, + KILLED_BY_FALLING_DOWN_STAIRS); you.turn_is_over = true; return; @@ -1540,11 +1540,11 @@ void up_stairs(dungeon_feature_type force_stair, if (is_valid_item( you.inv[i] ) && you.inv[i].base_type == OBJ_ORBS) { - ouch(INSTANT_DEATH, 0, KILLED_BY_WINNING); + ouch(INSTANT_DEATH, NON_MONSTER, KILLED_BY_WINNING); } } - ouch(INSTANT_DEATH, 0, KILLED_BY_LEAVING); + ouch(INSTANT_DEATH, NON_MONSTER, KILLED_BY_LEAVING); } you.prev_targ = MHITNOT; @@ -1936,8 +1936,8 @@ void down_stairs( int old_level, dungeon_feature_type force_stair, // Nastier than when climbing stairs, but you'll aways get to // your destination. -- bwr - ouch( roll_dice( 6 + you.burden_state, 10 ), 0, - KILLED_BY_FALLING_DOWN_STAIRS ); + ouch(roll_dice(6 + you.burden_state, 10), NON_MONSTER, + KILLED_BY_FALLING_DOWN_STAIRS); } if (shaft) |