summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-10-13 20:15:40 -0500
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-10-13 20:15:40 -0500
commitb693006ae5c1e471a4400900384d2419746c1b10 (patch)
treed34c7a65367d1e915ea58cede7038250c0b10fc4
parent6bfc75cc70b5f970c0ff00e59fbdfdaf0b7bf745 (diff)
downloadcrawl-ref-b693006ae5c1e471a4400900384d2419746c1b10.tar.gz
crawl-ref-b693006ae5c1e471a4400900384d2419746c1b10.zip
If Xom is making you blink, don't allow it to be a controlled blink.
-rw-r--r--crawl-ref/source/spl-cast.cc4
-rw-r--r--crawl-ref/source/spl-cast.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 66b835d736..48e1d3ccd3 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -2065,7 +2065,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
// Escape spells.
case SPELL_BLINK:
- random_blink(true);
+ random_blink(god != GOD_XOM);
break;
case SPELL_TELEPORT_SELF:
@@ -2191,7 +2191,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail)
return (SPRET_SUCCESS);
}
-void exercise_spell( spell_type spell, bool spc, bool success )
+void exercise_spell(spell_type spell, bool spc, bool success)
{
// (!success) reduces skill increase for miscast spells
int skill;
diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h
index 617f28d9b6..7595117df3 100644
--- a/crawl-ref/source/spl-cast.h
+++ b/crawl-ref/source/spl-cast.h
@@ -55,7 +55,7 @@ int spell_enhancement( unsigned int typeflags );
/* ***********************************************************************
* called from: it_use3 - spell
* *********************************************************************** */
-void exercise_spell( spell_type spell_ex, bool spc, bool divide );
+void exercise_spell(spell_type spell_ex, bool spc, bool divide);
// last updaetd 12may2000 {dlb}