diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-05-28 03:23:20 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 03:23:49 +0200 |
| commit | 42993c7a02bf24d02280df06c7140851e8cabb1a (patch) | |
| tree | 06e615a5e52bcdb3adaacb8f8b6647822f15908b /crawl-ref/source/tilepick-p.cc | |
| parent | ba45822b41b6e70911ecd7a59a4e4f6fca56d0d1 (diff) | |
| parent | 536f84b0a61318597e2980852e89e9a41d2dedb4 (diff) | |
| download | crawl-ref-42993c7a02bf24d02280df06c7140851e8cabb1a.tar.gz crawl-ref-42993c7a02bf24d02280df06c7140851e8cabb1a.zip | |
Merge branch 'master' into djinn
Diffstat (limited to 'crawl-ref/source/tilepick-p.cc')
| -rw-r--r-- | crawl-ref/source/tilepick-p.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index 854131ab07..1ac43cf715 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -15,6 +15,7 @@ #include "tiledoll.h" #include "tilepick.h" #include "transform.h" +#include "traps.h" static tileidx_t _modrng(int mod, tileidx_t first, tileidx_t last) { @@ -47,8 +48,8 @@ tileidx_t tilep_equ_weapon(const item_def &item) switch (item.sub_type) { case MISC_BOTTLED_EFREET: return TILEP_HAND1_BOTTLE; - case MISC_AIR_ELEMENTAL_FAN: return TILEP_HAND1_FAN; - case MISC_STONE_OF_EARTH_ELEMENTALS: return TILEP_HAND1_STONE; + case MISC_FAN_OF_GALES: return TILEP_HAND1_FAN; + case MISC_STONE_OF_TREMORS: return TILEP_HAND1_STONE; case MISC_DISC_OF_STORMS: return TILEP_HAND1_DISC; case MISC_CRYSTAL_BALL_OF_ENERGY: return TILEP_HAND1_CRYSTAL; @@ -553,7 +554,12 @@ tileidx_t tileidx_player() ch |= TILE_FLAG_FLYING; if (you.attribute[ATTR_HELD]) - ch |= TILE_FLAG_NET; + { + if (get_trapping_net(you.pos()) == NON_ITEM) + ch |= TILE_FLAG_WEB; + else + ch |= TILE_FLAG_NET; + } if (you.duration[DUR_POISONING]) ch |= TILE_FLAG_POISON; |