summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/database.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-22 21:57:35 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-22 21:57:35 +0000
commitea78e3b88da2c70285b09f34c9c5d8230280405b (patch)
treeb4de694fd30792e67bf1ebde5e3f770794992949 /crawl-ref/source/database.cc
parentf7cb474e41b75c37273b79d4fe5e7e24da81950d (diff)
downloadcrawl-ref-ea78e3b88da2c70285b09f34c9c5d8230280405b.tar.gz
crawl-ref-ea78e3b88da2c70285b09f34c9c5d8230280405b.zip
Swap '.' and '!' in the targetting interface.
Forbid bats wearing hats/caps or rings. (That makes amulets the only type of equipment Vampires can keep on when transforming.) To make up for it, increase their damage stats again. Also fix it being possible to (un)equip the allowed items in Tiles while in bat form. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6055 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/database.cc')
-rw-r--r--crawl-ref/source/database.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc
index 254b800b57..f60a8b59eb 100644
--- a/crawl-ref/source/database.cc
+++ b/crawl-ref/source/database.cc
@@ -654,7 +654,7 @@ std::string getShoutString(const std::string &monst,
/////////////////////////////////////////////////////////////////////////////
// Speak DB specific functions.
-std::string getSpeakString(const std::string &monst)
+std::string getSpeakString(const std::string &key)
{
if (!SpeakDB)
return ("");
@@ -662,9 +662,9 @@ std::string getSpeakString(const std::string &monst)
int num_replacements = 0;
#ifdef DEBUG_MONSPEAK
- mprf(MSGCH_DIAGNOSTICS, "monster speech lookup for %s", monst.c_str());
+ mprf(MSGCH_DIAGNOSTICS, "monster speech lookup for %s", key.c_str());
#endif
- return _getRandomizedStr(SpeakDB, monst, "", num_replacements);
+ return _getRandomizedStr(SpeakDB, key, "", num_replacements);
}
/////////////////////////////////////////////////////////////////////////////