diff options
Diffstat (limited to 'crawl-ref/source/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 691ffb0217..38bf295a7a 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -517,6 +517,19 @@ void wield_effects(int item_wield_2, bool showMsgs) // Right now that's always "uncursed". -- bwr set_ident_flags(item, ISFLAG_KNOW_CURSE); } + // Automatically identify rods; you can do this by wielding and then + // evoking them, so do it automatically instead. We don't need to give + // a message either, as the game will do that automatically. {due} + if (item_is_rod(item)) + { + if (!item_type_known(item)) + { + set_ident_type( OBJ_STAVES, item.sub_type, ID_KNOWN_TYPE ); + set_ident_flags( item, ISFLAG_KNOW_TYPE ); + } + if (!item_ident( item, ISFLAG_KNOW_PLUSES)) + set_ident_flags( item, ISFLAG_KNOW_PLUSES ); + } break; } @@ -4142,7 +4155,7 @@ static bool _dont_use_invis() } else if (get_contamination_level() > 0 && !yesno("Invisibility will do you no good right now; " - "use anyways?")) + "use anyways?", false, 'n')) { return (true); } @@ -4547,14 +4560,14 @@ bool _drink_fountain() potion_type fountain_effect = POT_WATER; if (feat == DNGN_FOUNTAIN_BLUE) { - if (!yesno("Drink from the fountain?")) + if (!yesno("Drink from the fountain?", true, 'n')) return (false); mpr("You drink the pure, clear water."); } else if (feat == DNGN_FOUNTAIN_BLOOD) { - if (!yesno("Drink from the fountain of blood?")) + if (!yesno("Drink from the fountain of blood?", true, 'n')) return (false); mpr("You drink the blood."); @@ -4562,7 +4575,7 @@ bool _drink_fountain() } else { - if (!yesno("Drink from the sparkling fountain?")) + if (!yesno("Drink from the sparkling fountain?", true, 'n')) return (false); mpr("You drink the sparkling water."); |