From 57f3e71ae59d5e4830bdf787d9f2d5e9d5fe8fc8 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 25 Sep 2008 17:30:31 +0000 Subject: 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 --- crawl-ref/source/traps.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/traps.cc') diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index fae7a411ec..16aaa0ab87 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -260,7 +260,10 @@ static void dart_trap(bool trap_known, int trapped, bolt &pbolt, bool poison) damage_taken -= random2( player_AC() + 1 ); if (damage_taken > 0) - ouch( damage_taken, 0, KILLED_BY_TRAP, pbolt.name.c_str() ); + { + ouch(damage_taken, NON_MONSTER, KILLED_BY_TRAP, + pbolt.name.c_str()); + } } else { @@ -429,7 +432,7 @@ void handle_traps(trap_type trt, int i, bool trap_known) mpr("A huge blade swings out and slices into you!"); int damage = (you.your_level * 2) + random2avg(29, 2) - random2(1 + player_AC()); - ouch( damage, 0, KILLED_BY_TRAP, " blade" ); + ouch(damage, NON_MONSTER, KILLED_BY_TRAP, " blade"); bleed_onto_floor(you.pos(), -1, damage, true); } break; -- cgit v1.2.3-54-g00ecf