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/player-act.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/player-act.cc')
| -rw-r--r-- | crawl-ref/source/player-act.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/crawl-ref/source/player-act.cc b/crawl-ref/source/player-act.cc index f95f86904f..a6880d53c7 100644 --- a/crawl-ref/source/player-act.cc +++ b/crawl-ref/source/player-act.cc @@ -159,7 +159,11 @@ bool player::is_habitable_feat(dungeon_feature_type actual_grid) const if (!can_pass_through_feat(actual_grid)) return false; - if (airborne() || species == SP_DJINNI) + if (airborne() +#if TAG_MAJOR_VERSION == 34 + || species == SP_DJINNI +#endif + ) return true; if (actual_grid == DNGN_LAVA && species != SP_LAVA_ORC @@ -491,8 +495,10 @@ string player::foot_name(bool plural, bool *can_plural) const } else if (species == SP_FELID) str = "paw"; +#if TAG_MAJOR_VERSION == 34 else if (species == SP_DJINNI) str = "underside", *can_plural = false; +#endif else if (fishtail) { str = "tail"; @@ -694,6 +700,7 @@ bool player::can_go_berserk(bool intentional, bool potion, bool quiet) const return false; } +#if TAG_MAJOR_VERSION == 34 if (you.species == SP_DJINNI) { if (verbose) @@ -702,6 +709,7 @@ bool player::can_go_berserk(bool intentional, bool potion, bool quiet) const return false; } +#endif if (is_lifeless_undead()) { if (verbose) |