diff options
| author | Florian Diebold <flodiebold@gmail.com> | 2013-03-19 16:25:46 +0100 |
|---|---|---|
| committer | Florian Diebold <flodiebold@gmail.com> | 2013-03-19 16:29:06 +0100 |
| commit | 5504a089ba5f20c75284c5c4944c83270e97aff5 (patch) | |
| tree | a9495d6fc017403061b92fb31b6244f2f8580896 /crawl-ref/source/tilepick-p.cc | |
| parent | 7c889ac88c35c57549f5db26e2f8012d01289a32 (diff) | |
| download | crawl-ref-5504a089ba5f20c75284c5c4944c83270e97aff5.tar.gz crawl-ref-5504a089ba5f20c75284c5c4944c83270e97aff5.zip | |
Handle lich and statue form tiles the same way as tree form.
This removes the _transform_add_weapon hack, and shows all unmelded
equipment on statues and shields on liches; armour doesn't fit right
on the current lich tile so it is disabled.
Diffstat (limited to 'crawl-ref/source/tilepick-p.cc')
| -rw-r--r-- | crawl-ref/source/tilepick-p.cc | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index ee613ce4e5..03b4a28dda 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -481,6 +481,11 @@ tileidx_t tileidx_player() // Handle shapechange first switch (you.form) { + // equipment-using forms are handled regularly + case TRAN_STATUE: + case TRAN_LICH: + case TRAN_TREE: + break; // animals case TRAN_BAT: ch = TILEP_TRAN_BAT; break; case TRAN_SPIDER: ch = TILEP_TRAN_SPIDER; break; @@ -490,20 +495,7 @@ tileidx_t tileidx_player() case TRAN_ICE_BEAST: ch = TILEP_TRAN_ICE_BEAST; break; case TRAN_WISP: ch = TILEP_MONS_INSUBSTANTIAL_WISP; break; case TRAN_JELLY: ch = TILEP_MONS_JELLY; break; - case TRAN_TREE: break; // handled like regular players case TRAN_FUNGUS: ch = TILEP_MONS_WANDERING_MUSHROOM; break; - case TRAN_STATUE: - { - switch (you.species) - { - case SP_CENTAUR: ch = TILEP_TRAN_STATUE_CENTAUR; break; - case SP_NAGA: ch = TILEP_TRAN_STATUE_NAGA; break; - case SP_FELID: ch = TILEP_TRAN_STATUE_FELID; break; - case SP_OCTOPODE:ch = TILEP_TRAN_STATUE_OCTOPODE; break; - default: ch = TILEP_TRAN_STATUE_HUMANOID; break; - } - break; - } case TRAN_DRAGON: { switch (you.species) @@ -521,18 +513,6 @@ tileidx_t tileidx_player() } break; } - case TRAN_LICH: - { - switch (you.species) - { - case SP_CENTAUR: ch = TILEP_TRAN_LICH_CENTAUR; break; - case SP_NAGA: ch = TILEP_TRAN_LICH_NAGA; break; - case SP_FELID: ch = TILEP_TRAN_LICH_FELID; break; - case SP_OCTOPODE:ch = TILEP_TRAN_LICH_OCTOPODE; break; - default: ch = TILEP_TRAN_LICH_HUMANOID; break; - } - break; - } // no special tile case TRAN_BLADE_HANDS: break; case TRAN_APPENDAGE: |