From ee2afdbd1610f7a204808056bf1a5826085b89c8 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Wed, 14 May 2008 15:00:11 +0000 Subject: FR 1962016: Make hydra headedness more obvious. You now get messages like "The seven-headed hydra bites." and "You slice the 12-headed hydra." FR 1963606: Take a note when you pick up a rune (or the Orb!) for the first time. There are a couple of other files I changed, but I can't remember any big stuff, so it was probably just cleanup. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5029 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/describe.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crawl-ref/source/describe.cc') diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 802325817b..31a44be7ea 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -512,19 +512,20 @@ int str_to_trap(const std::string &s) { ASSERT(NUM_TRAPS == sizeof(trap_names) / sizeof(*trap_names)); + // allow a couple of synonyms if (s == "random" || s == "any") return (TRAP_RANDOM); else if (s == "suitable") return (TRAP_INDEPTH); - else if (s == "nonteleport" || s == "noteleport" || s == "nontele" - || s == "notele") + else if (s == "nonteleport" || s == "noteleport" + || s == "nontele" || s == "notele") + { return (TRAP_NONTELEPORT); + } for (int i = 0; i < NUM_TRAPS; ++i) - { if (trap_names[i] == s) return (i); - } return (-1); } -- cgit v1.2.3-54-g00ecf