summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/describe.cc8
-rw-r--r--crawl-ref/source/direct.cc2
-rw-r--r--crawl-ref/source/item_use.cc6
3 files changed, 9 insertions, 7 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index 704ec52e2e..3bebee1834 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -3920,10 +3920,9 @@ static std::string religion_help( god_type god )
+ std::string(god_name(god)) + " to bless a ";
result += (god == GOD_ZIN ? "mace" : "long sword");
result += ".";
- break;
}
break;
-
+
case GOD_LUGONU:
if (!player_under_penance() && you.piety > 160
&& !you.num_gifts[god])
@@ -3947,8 +3946,9 @@ static std::string religion_help( god_type god )
break;
case GOD_VEHUMET:
- result += "Vehumet assists you in casting Conjurations"
- " and Summonings during prayer.";
+ if (you.piety >= 50)
+ result += "Vehumet assists you in casting Conjurations"
+ " and Summonings during prayer.";
break;
default:
diff --git a/crawl-ref/source/direct.cc b/crawl-ref/source/direct.cc
index b08f307a6b..7d7598cf0e 100644
--- a/crawl-ref/source/direct.cc
+++ b/crawl-ref/source/direct.cc
@@ -619,7 +619,7 @@ void direction(dist& moves, targeting_type restricts,
if ( moves.isTarget &&
moves.tx == you.x_pos && moves.ty == you.y_pos &&
mode == TARG_ENEMY && Options.confirm_self_target &&
- !yesno("Really target yourself?"))
+ !yesno("Really target yourself?", false, 'n'))
{
mesclr();
show_prompt = true;
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index e306963512..bd614dbc85 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -271,7 +271,8 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages)
mpr(you.inv[item_slot].name(DESC_INVENTORY_EQUIP).c_str());
// warn player about low str/dex or throwing skill
- wield_warning();
+ if (show_weff_messages)
+ wield_warning();
// time calculations
you.time_taken /= 2;
@@ -2051,7 +2052,8 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus,
// They don't do any damage!
baseDam = 0;
exDamBonus = 0;
-
+ ammoDamBonus = 0;
+
// but accuracy is important for this one
baseHit = 1;
exHitBonus += (skill_bump(SK_RANGED_COMBAT) * 7 / 2);