diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-11 02:35:57 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-11 02:35:57 +0000 |
| commit | 5943f95a4250cfdedd44091a1f9eac52e3cbb085 (patch) | |
| tree | 3a5938ca56d31558a1bd78e73cf6651db06d259a | |
| parent | ef44f8a14f413dda35df8eac4e9c2ed00b946d70 (diff) | |
| download | crawl-ref-5943f95a4250cfdedd44091a1f9eac52e3cbb085.tar.gz crawl-ref-5943f95a4250cfdedd44091a1f9eac52e3cbb085.zip | |
Add fixes based on ncampion's (slightly tweaked) patches:
[1910635] database lookups of autoinscribed wands fail
[1911451] mummies get a starvation warning
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3592 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/direct.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/itemname.cc | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc index d59f2a2f9b..73c204f1b6 100644 --- a/crawl-ref/source/direct.cc +++ b/crawl-ref/source/direct.cc @@ -1504,7 +1504,7 @@ void describe_floor() channel = MSGCH_EXAMINE_FILTER; } mpr((prefix + feat + suffix).c_str(), channel); - if (grid == DNGN_ENTER_LABYRINTH) + if (grid == DNGN_ENTER_LABYRINTH && you.is_undead != US_UNDEAD) mpr("Beware, for starvation awaits!", MSGCH_EXAMINE); } diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 76d660a1bc..2c87e39c97 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -1270,11 +1270,13 @@ std::string item_def::name_aux( description_level_type desc, if (know_pluses) buff << " (" << it_plus << ")"; - else if (item_plus2 == ZAPCOUNT_EMPTY) - buff << " {empty}"; - else if (item_plus2 > 0) - buff << " {zapped: " << item_plus2 - << '}'; + else if (!dbname) + { + if (item_plus2 == ZAPCOUNT_EMPTY) + buff << " {empty}"; + else if (item_plus2 > 0) + buff << " {zapped: " << item_plus2 << '}'; + } break; case OBJ_POTIONS: |