diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-16 22:23:42 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-07-16 22:23:42 +0000 |
| commit | 9b1cdaf406c3cefd731676c4c67043b6f1158e09 (patch) | |
| tree | 9d7b728ec34b4394dc45b7eb7c23415d119903c2 /crawl-ref/source/output.cc | |
| parent | e5921968c3f1f4ba975bf381cde709f7770649d2 (diff) | |
| download | crawl-ref-9b1cdaf406c3cefd731676c4c67043b6f1158e09.tar.gz crawl-ref-9b1cdaf406c3cefd731676c4c67043b6f1158e09.zip | |
Fix 2819298: sling bullets not counting towards _ammo_count for slings
Fix 2822293: colour "slot restricted" darkgrey on % screen
Fix 2822279: polymorph other taking MR into account
Fix 2821651: berserking monsters respecting 't' orders
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10247 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/output.cc')
| -rw-r--r-- | crawl-ref/source/output.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index 366386004d..81cc4a51ac 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -1310,8 +1310,8 @@ static std::string _verbose_info(const monsters* m) return(" (fleeing)"); if (mons_is_sleeping(m)) { - if (mons_holiness(m) == MH_UNDEAD - || mons_holiness(m) == MH_NONLIVING + if (mons_holiness(m) == MH_UNDEAD + || mons_holiness(m) == MH_NONLIVING || mons_holiness(m) == MH_PLANT) { return(" (dormant)"); @@ -1768,14 +1768,14 @@ static void _print_overview_screen_equip(column_composer& cols, if (you.equip[ e_order[i] ] != -1) { - const int item_idx = you.equip[e_order[i]]; - const item_def& item = you.inv[item_idx]; - const bool not_melded = player_wearing_slot(e_order[i]); + // The player has something equipped. + const int item_idx = you.equip[e_order[i]]; + const item_def& item = you.inv[item_idx]; + const bool melded = !player_wearing_slot(e_order[i]); // Colour melded equipment dark grey. - const char* colname = - not_melded ? colour_to_str(item.colour).c_str() - : "darkgrey"; + const char* colname = melded ? "darkgrey" + : colour_to_str(item.colour).c_str(); const char equip_char = index_to_letter(item_idx); @@ -1784,7 +1784,7 @@ static void _print_overview_screen_equip(column_composer& cols, slot, equip_char, colname, - not_melded ? "" : "melded ", + melded ? "melded " : "", item.name(DESC_PLAIN, true).substr(0,42).c_str(), colname); equip_chars.push_back(equip_char); @@ -1819,7 +1819,7 @@ static void _print_overview_screen_equip(column_composer& cols, else if (!you_can_wear(e_order[i])) { snprintf(buf, sizeof buf, - "<lightgrey>(%s restricted)</lightgrey>", slot_name_lwr); + "<darkgrey>(%s restricted)</darkgrey>", slot_name_lwr); } else { |