diff options
| author | pubby <pubby8@gmail.com> | 2013-08-31 16:40:44 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-08-31 16:49:50 -0500 |
| commit | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (patch) | |
| tree | d4a3d59267fa5c14ae7573b91f7dac9b66955159 /crawl-ref/source/tilepick-p.cc | |
| parent | c4b51221cd6f40f90127768df0e2e1ad7ed7310e (diff) | |
| parent | 70ca29ee15926336c0ab2369cb25743a9e510e08 (diff) | |
| download | crawl-ref-65c58ed6ccd53a9a080255ee37e131123ac65e96.tar.gz crawl-ref-65c58ed6ccd53a9a080255ee37e131123ac65e96.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/docs/crawl_manual.reST
crawl-ref/source/abl-show.cc
crawl-ref/source/dat/descript/ability.txt
crawl-ref/source/delay.cc
crawl-ref/source/enum.h
crawl-ref/source/main.cc
crawl-ref/source/mon-cast.cc
crawl-ref/source/mon-gear.cc
crawl-ref/source/mon-spll.h
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/ng-setup.cc
crawl-ref/source/output.cc
crawl-ref/source/player-act.cc
crawl-ref/source/player.cc
crawl-ref/source/species.cc
crawl-ref/source/spl-data.h
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/tilepick-p.cc')
| -rw-r--r-- | crawl-ref/source/tilepick-p.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index f32c4492dc..3839464766 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -58,10 +58,6 @@ tileidx_t tilep_equ_weapon(const item_def &item) case MISC_LAMP_OF_FIRE: return TILEP_HAND1_LANTERN; case MISC_LANTERN_OF_SHADOWS: return TILEP_HAND1_BONE_LANTERN; case MISC_HORN_OF_GERYON: return TILEP_HAND1_HORN; - -#if TAG_MAJOR_VERSION == 34 - case MISC_EMPTY_EBONY_CASKET: -#endif case MISC_BOX_OF_BEASTS: return TILEP_HAND1_BOX; case MISC_DECK_OF_ESCAPE: @@ -103,11 +99,6 @@ tileidx_t tilep_equ_weapon(const item_def &item) case WPN_FLAIL: tile = TILEP_HAND1_FLAIL; break; -#if TAG_MAJOR_VERSION == 34 - case WPN_SPIKED_FLAIL: - tile = TILEP_HAND1_SPIKED_FLAIL; - break; -#endif case WPN_DIRE_FLAIL: tile = TILEP_HAND1_GREAT_FLAIL; break; @@ -670,6 +661,8 @@ tileidx_t tilep_species_to_base_tile(int sp, int level) return TILEP_BASE_VAMPIRE; case SP_DEEP_DWARF: return TILEP_BASE_DEEP_DWARF; + case SP_GARGOYLE: + return TILEP_BASE_GARGOYLE; case SP_FELID: return TILEP_BASE_FELID; case SP_OCTOPODE: |