summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/spl-miscast.cc
diff options
context:
space:
mode:
authorwheals <shm.mark@gmail.com>2014-02-12 18:59:28 -0500
committerShmuale Mark <shm.mark@gmail.com>2014-02-24 23:50:41 -0500
commit474977d740c070c7240df71e69437b8c955fe5b0 (patch)
treec29b2dadefb3b01367e3689c3ee35705edc25a53 /crawl-ref/source/spl-miscast.cc
parent2228498b1c13e8181272757c7e3971bbce30689c (diff)
downloadcrawl-ref-474977d740c070c7240df71e69437b8c955fe5b0.tar.gz
crawl-ref-474977d740c070c7240df71e69437b8c955fe5b0.zip
Remove djinn.
Djinn games can't be started (hopefully including using the rcfile), and djinn code should be removed on save-compat bump. Also, schedule a few SE things to be removed.
Diffstat (limited to 'crawl-ref/source/spl-miscast.cc')
-rw-r--r--crawl-ref/source/spl-miscast.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/crawl-ref/source/spl-miscast.cc b/crawl-ref/source/spl-miscast.cc
index 146fe620b1..7fcabf36e6 100644
--- a/crawl-ref/source/spl-miscast.cc
+++ b/crawl-ref/source/spl-miscast.cc
@@ -1516,7 +1516,11 @@ void MiscastEffect::_divination_you(int severity)
break;
case 1:
mpr("You lose your focus.");
- if (you.magic_points > 0 || you.species == SP_DJINNI)
+ if (you.magic_points > 0
+#if TAG_MAJOR_VERSION == 34
+ || you.species == SP_DJINNI
+#endif
+ )
{
drain_mp(3 + random2(10));
mprf(MSGCH_WARN, "You suddenly feel drained of magical energy!");
@@ -1532,7 +1536,11 @@ void MiscastEffect::_divination_you(int severity)
{
case 0:
mpr("You lose concentration completely!");
- if (you.magic_points > 0 || you.species == SP_DJINNI)
+ if (you.magic_points > 0 ||
+#if TAG_MAJOR_VERSION == 34
+ you.species == SP_DJINNI
+#endif
+ )
{
drain_mp(5 + random2(20));
mprf(MSGCH_WARN, "You suddenly feel drained of magical energy!");