summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-19 00:56:37 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-19 00:56:37 +0000
commit57971c576d6dae9167169d4ca4011c52821be03b (patch)
treea36d11186a08114869bda27ddbe1f1ce3e2c5728
parent0af6e3ad82438c716f6ab3250c6e908aebd63419 (diff)
downloadcrawl-ref-57971c576d6dae9167169d4ca4011c52821be03b.tar.gz
crawl-ref-57971c576d6dae9167169d4ca4011c52821be03b.zip
Fix spacing in death-by-trap message.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7489 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/hiscores.cc3
-rw-r--r--crawl-ref/source/traps.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 5a8b5ebf48..9938e379b0 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -1563,7 +1563,8 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity)
else
{
snprintf( scratch, sizeof(scratch),
- "Killed by triggering a%s trap",
+ "Killed by triggering a%s%s trap",
+ auxkilldata.empty() ? "" : " ",
auxkilldata.c_str() );
desc += scratch;
}
diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc
index dc27ad8df8..d361f04695 100644
--- a/crawl-ref/source/traps.cc
+++ b/crawl-ref/source/traps.cc
@@ -428,7 +428,7 @@ void trap_def::trigger(actor& triggerer, bool flat_footed)
mpr("A huge blade swings out and slices into you!");
const int damage = (you.your_level * 2) + random2avg(29, 2)
- random2(1 + player_AC());
- ouch(damage, NON_MONSTER, KILLED_BY_TRAP, " blade");
+ ouch(damage, NON_MONSTER, KILLED_BY_TRAP, "blade");
bleed_onto_floor(you.pos(), -1, damage, true);
}
}