diff options
Diffstat (limited to 'crawl-ref/source/tilepick.cc')
| -rw-r--r-- | crawl-ref/source/tilepick.cc | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 4d40a20c0c..cf18035dfb 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -109,7 +109,6 @@ static int _bow_offset(const monsters *mon) case WPN_BOW: case WPN_LONGBOW: case WPN_CROSSBOW: - case WPN_HAND_CROSSBOW: return (0); default: return (1); @@ -277,6 +276,9 @@ int tileidx_monster_base(const monsters *mon, bool detected) // merfolk ('m') case MONS_MERFOLK: + case MONS_MERFOLK_IMPALER: // TODO + case MONS_MERFOLK_AQUAMANCER: // TODO + case MONS_MERFOLK_JAVELINEER: // TODO if (in_water) return TILEP_MONS_MERFOLK_FIGHTER_WATER; else @@ -1301,9 +1303,6 @@ static int _tileidx_weapon_base(const item_def &item) case WPN_CROSSBOW: return TILE_WPN_CROSSBOW; - case WPN_HAND_CROSSBOW: - return TILE_WPN_HAND_CROSSBOW; - case WPN_SPEAR: return TILE_WPN_SPEAR; @@ -2009,6 +2008,20 @@ static int _tileidx_corpse(const item_def &item) case MONS_DEATH_YAK: return TILE_CORPSE_DEATH_YAK; + // water monsters + case MONS_BIG_FISH: + return TILE_CORPSE_BIG_FISH; + case MONS_GIANT_GOLDFISH: + return TILE_CORPSE_GIANT_GOLDFISH; + case MONS_ELECTRIC_EEL: + return TILE_CORPSE_ELECTRIC_EEL; + case MONS_SHARK: + return TILE_CORPSE_SHARK; + case MONS_KRAKEN: + return TILE_CORPSE_KRAKEN; + case MONS_JELLYFISH: + return TILE_CORPSE_JELLYFISH; + // humans ('@') case MONS_HUMAN: case MONS_HELL_KNIGHT: @@ -3988,7 +4001,6 @@ int tilep_equ_weapon(const item_def &item) case WPN_SLING: return TILEP_HAND1_SLING; case WPN_BOW: return TILEP_HAND1_BOW2; case WPN_CROSSBOW: return TILEP_HAND1_CROSSBOW; - case WPN_HAND_CROSSBOW: return TILEP_HAND1_CROSSBOW; case WPN_BLOWGUN: return TILEP_HAND1_BLOWGUN; case WPN_LONGBOW: return TILEP_HAND1_BOW3; |