diff options
author | wheals <shm.mark@gmail.com> | 2014-02-12 18:59:28 -0500 |
---|---|---|
committer | Shmuale Mark <shm.mark@gmail.com> | 2014-02-24 23:50:41 -0500 |
commit | 474977d740c070c7240df71e69437b8c955fe5b0 (patch) | |
tree | c29b2dadefb3b01367e3689c3ee35705edc25a53 /crawl-ref/source/actor.cc | |
parent | 2228498b1c13e8181272757c7e3971bbce30689c (diff) | |
download | crawl-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/actor.cc')
-rw-r--r-- | crawl-ref/source/actor.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc index aa7642ee17..4050f54a52 100644 --- a/crawl-ref/source/actor.cc +++ b/crawl-ref/source/actor.cc @@ -52,7 +52,11 @@ bool actor::airborne() const */ bool actor::ground_level() const { - return !airborne() && !is_wall_clinging() && mons_species() != MONS_DJINNI; + return !airborne() && !is_wall_clinging() +#if TAG_MAJOR_VERSION == 34 + && mons_species() != MONS_DJINNI +#endif + ; } bool actor::stand_on_solid_ground() const |