summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spells3.cc
diff options
context:
space:
mode:
authorDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-11 16:13:36 +0530
committerDarshan Shaligram <dshaligram@users.sourceforge.net>2010-01-11 16:13:36 +0530
commit89b4e230ad3bdc806ae058722c70441d49f5d9fe (patch)
treefef3ab5111d75ce5869881542267c9f848e1fe33 /crawl-ref/source/spells3.cc
parent5871154a2e85ccd38874e88dea22083ced372141 (diff)
downloadcrawl-ref-89b4e230ad3bdc806ae058722c70441d49f5d9fe.tar.gz
crawl-ref-89b4e230ad3bdc806ae058722c70441d49f5d9fe.zip
Amulet of stasis, first cut.
Amulets of stasis blocks: - Teleport self - Blink in all forms - Slowing - Hasting - Paralysis - Petrify - Berserker rage The amulet auto-ids the first time it triggers. The amulet does not affect existing conditions (such as an existing Haste spell or an existing post-berserk Slow).
Diffstat (limited to 'crawl-ref/source/spells3.cc')
-rw-r--r--crawl-ref/source/spells3.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index 1a30607199..a885e9eb42 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -34,6 +34,7 @@
#include "itemname.h"
#include "itemprop.h"
#include "items.h"
+#include "item_use.h"
#include "message.h"
#include "misc.h"
#include "mon-behv.h"
@@ -1383,8 +1384,10 @@ bool allow_control_teleport(bool quiet)
void you_teleport(void)
{
- if (scan_artefacts(ARTP_PREVENT_TELEPORTATION))
+ if (item_blocks_teleport(true))
+ {
mpr("You feel a weird sense of stasis.");
+ }
else if (you.duration[DUR_TELEPORT])
{
mpr("You feel strangely stable.");
@@ -1493,7 +1496,7 @@ static bool _teleport_player(bool allow_control, bool new_abyss_area, bool wizar
if (wizard_tele)
is_controlled = true;
- if (scan_artefacts(ARTP_PREVENT_TELEPORTATION) && !wizard_tele)
+ if (item_blocks_teleport(true) && !wizard_tele)
{
mpr("You feel a strange sense of stasis.");
return (false);