diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-31 20:26:20 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-05-31 20:26:20 +0000 |
commit | 57ec78ae83592e5f55457fbcff4de929f5a9b7d7 (patch) | |
tree | 7f85295bb2791f405554336cc2e1ebb744571a4c /crawl-ref/source/food.cc | |
parent | 7df3a8aa8296fea631280b085f4c70a93fd23a54 (diff) | |
download | crawl-ref-57ec78ae83592e5f55457fbcff4de929f5a9b7d7.tar.gz crawl-ref-57ec78ae83592e5f55457fbcff4de929f5a9b7d7.zip |
Consolidate all cases where corpses are turned into skeletons, as
suggested by dolorous in BR 1977925, and turn coloured draconian
corpses into plain draconian skeletons. Same when the game attempts
to create coloured draconian skeletons or simulacrums.
Added autoinscription to the single inscription command ('{') - this is
necessary for items with long descriptions that can't autoinscribed
otherwise.
Added a small hack to make death cobs (%) appear correctly in the monster
list.
The rest is cleanup, I believe.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5376 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/food.cc')
-rw-r--r-- | crawl-ref/source/food.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/food.cc b/crawl-ref/source/food.cc index d63f7cca1d..f8eae1a32f 100644 --- a/crawl-ref/source/food.cc +++ b/crawl-ref/source/food.cc @@ -183,14 +183,14 @@ static bool _find_butchering_implement( bool fallback ) "for butchering."); return (false); } - // no switching necessary + // No switching necessary. if (can_cut_meat( *wpn )) return (false); } int old_weapon = you.equip[EQ_WEAPON]; - // look for a butchering implement in your pack + // Look for a butchering implement in your pack. for (int i = 0; i < ENDOFPACK; ++i) { if (is_valid_item( you.inv[i] ) @@ -339,7 +339,7 @@ static bool _have_corpses_in_pack(bool remind) if (!is_valid_item( obj )) continue; - if (obj.base_type == OBJ_CORPSES) + if (obj.base_type == OBJ_CORPSES && obj.sub_type == CORPSE_BODY) num++; } @@ -371,8 +371,7 @@ static bool _have_corpses_in_pack(bool remind) else { text << "If you dropped the " << noun << " in your pack on solid " - << "ground or into shallow water then you could " << verb - << " " << pronoun << "."; + << "ground then you could " << verb << " " << pronoun << "."; } mpr(text.str().c_str()); |