summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-book.cc
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/spl-book.cc')
-rw-r--r--crawl-ref/source/spl-book.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc
index 33206f31c5..9b4535d3dc 100644
--- a/crawl-ref/source/spl-book.cc
+++ b/crawl-ref/source/spl-book.cc
@@ -40,7 +40,6 @@
#include "religion.h"
#include "spl-cast.h"
#include "spl-util.h"
-#include "state.h"
#include "stuff.h"
#define SPELLBOOK_SIZE 8
@@ -161,7 +160,7 @@ static spell_type spellbook_template_array[NUMBER_SPELLBOOKS][SPELLBOOK_SIZE] =
},
// 11 - Book of Spatial Translocations
{SPELL_APPORTATION,
- SPELL_PORTAL_PROJECTILE,
+ SPELL_PORTALED_PROJECTILE,
SPELL_BLINK,
SPELL_RECALL,
SPELL_TELEPORT_OTHER,
@@ -1486,14 +1485,12 @@ int staff_spell( int staff )
if (food && (you.hunger_state <= HS_STARVING || you.hunger <= food))
{
mpr("You don't have the energy to cast that spell.");
- crawl_state.zero_turns_taken();
return (-1);
}
if (istaff.plus < mana)
{
mpr("The rod doesn't have enough magic points.");
- crawl_state.zero_turns_taken();
// Don't lose a turn for trying to evoke without enough MP - that's
// needlessly cruel for an honest error.
return (-1);
@@ -1502,7 +1499,6 @@ int staff_spell( int staff )
if (you.experience_level < diff)
{
mprf("You need to be at least level %d to use that.", diff);
- crawl_state.zero_turns_taken();
return (-1);
}
@@ -1515,10 +1511,7 @@ int staff_spell( int staff )
}
// All checks passed, we can cast the spell
else if (your_spells(spell, powc, false) == SPRET_ABORT)
- {
- crawl_state.zero_turns_taken();
return (-1);
- }
make_hungry( food, true );
istaff.plus -= mana;