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/tilepick-p.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/tilepick-p.cc')
| -rw-r--r-- | crawl-ref/source/tilepick-p.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index 88bd3e7869..d44726d1c4 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -626,8 +626,10 @@ tileidx_t tilep_species_to_base_tile(int sp, int level) return TILEP_BASE_FELID; case SP_OCTOPODE: return TILEP_BASE_OCTOPODE; +#if TAG_MAJOR_VERSION == 34 case SP_DJINNI: return TILEP_BASE_DJINNI; +#endif case SP_FORMICID: return TILEP_BASE_FORMICID; case SP_VINE_STALKER: @@ -764,9 +766,11 @@ void tilep_race_default(int sp, int level, dolls_data *doll) case SP_FORMICID: hair = 0; break; +#if TAG_MAJOR_VERSION == 34 case SP_DJINNI: hair = TILEP_HAIR_DJINN2; break; +#endif default: // nothing to do break; @@ -1038,6 +1042,7 @@ void tilep_calc_flags(const dolls_data &doll, int flag[]) flag[TILEP_PART_LEG] = TILEP_FLAG_HIDE; flag[TILEP_PART_SHADOW] = TILEP_FLAG_HIDE; } +#if TAG_MAJOR_VERSION == 34 else if (is_player_tile(doll.parts[TILEP_PART_BASE], TILEP_BASE_DJINNI)) { flag[TILEP_PART_BOOTS] = TILEP_FLAG_HIDE; @@ -1045,6 +1050,7 @@ void tilep_calc_flags(const dolls_data &doll, int flag[]) flag[TILEP_PART_SHADOW] = TILEP_FLAG_HIDE; flag[TILEP_PART_BODY] = TILEP_FLAG_CUT_NAGA; // Do they need their own flag? } +#endif else if (doll.parts[TILEP_PART_BASE] >= TILEP_BASE_DRACONIAN_FIRST && doll.parts[TILEP_PART_BASE] <= TILEP_BASE_DRACONIAN_LAST) { |