summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ouch.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/ouch.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/ouch.cc')
-rw-r--r--crawl-ref/source/ouch.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc
index 93abfa01a4..18216723a5 100644
--- a/crawl-ref/source/ouch.cc
+++ b/crawl-ref/source/ouch.cc
@@ -164,12 +164,14 @@ int check_your_resists(int hurted, beam_type flavour, string source,
break;
case BEAM_HELLFIRE:
+#if TAG_MAJOR_VERSION == 34
if (you.species == SP_DJINNI)
{
hurted = 0;
if (doEffects)
mpr("You resist completely.");
}
+#endif
// Inconsistency: no penalty for rF-, unlike monsters. That's
// probably good, and monsters should be changed.
break;