summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/effects.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/effects.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/effects.cc')
-rw-r--r--crawl-ref/source/effects.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc
index 18811c42d0..c61555bd02 100644
--- a/crawl-ref/source/effects.cc
+++ b/crawl-ref/source/effects.cc
@@ -2015,9 +2015,10 @@ static void _handle_magic_contamination()
if (you.duration[DUR_FINESSE])
added_contamination += 20;
+#if TAG_MAJOR_VERSION == 34
if (you.duration[DUR_REGENERATION] && you.species == SP_DJINNI)
added_contamination += 20;
-
+#endif
// The Orb halves dissipation (well a bit more, I had to round it),
// but won't cause glow on its own -- otherwise it'd spam the player
// with messages about contamination oscillating near zero.
@@ -2086,7 +2087,12 @@ static void _magic_contamination_effects(int time_delta)
"mutagenic glow", true,
coinflip(),
false, false, false, false,
- you.species == SP_DJINNI);
+#if TAG_MAJOR_VERSION == 34
+ you.species == SP_DJINNI
+#else
+ false
+#endif
+ );
// we're meaner now, what with explosions and whatnot, but
// we dial down the contamination a little faster if its actually