diff options
-rw-r--r-- | crawl-ref/source/describe.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/itemprop.h | 9 | ||||
-rw-r--r-- | crawl-ref/source/tilepick.cc | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 140475f8dd..9727d5f189 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1142,7 +1142,6 @@ static std::string _describe_ammo( const item_def &item ) always_destroyed = true; break; case SPMSL_POISONED: - case SPMSL_POISONED_II: description += "It is coated with poison."; break; case SPMSL_CURARE: diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 0ad5f43bad..5b035371d1 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -368,14 +368,13 @@ enum special_missile_type // to separate from weapons in general {dlb} SPMSL_FLAME, SPMSL_FROST, SPMSL_POISONED, - SPMSL_POISONED_II, // unused - SPMSL_CURARE, // 5 - SPMSL_RETURNING, + SPMSL_CURARE, + SPMSL_RETURNING, // 5 SPMSL_CHAOS, SPMSL_PENETRATION, SPMSL_SHADOW, - SPMSL_DISPERSAL, // 10 - SPMSL_EXPLODING, + SPMSL_DISPERSAL, + SPMSL_EXPLODING, // 10 SPMSL_STEEL, SPMSL_SILVER }; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 60d701052d..b222351f2a 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1403,12 +1403,12 @@ static int _tileidx_missile(const item_def &item) case MI_THROWING_NET: return TILE_MI_THROWING_NET; case MI_DART: - if (brand == SPMSL_POISONED || brand == SPMSL_POISONED_II) + if (brand == SPMSL_POISONED) return TILE_MI_DART_P; return TILE_MI_DART; case MI_NEEDLE: - if (brand == SPMSL_POISONED || brand == SPMSL_POISONED_II) + if (brand == SPMSL_POISONED) return TILE_MI_NEEDLE_P; return TILE_MI_NEEDLE; } |