From 11b086105f15c5bfaf429b9715b02ad65c7c0539 Mon Sep 17 00:00:00 2001 From: Johanna Ploog Date: Fri, 15 Jan 2010 17:35:58 +0100 Subject: Add tiles for the new merfolk monsters. The plain merfolk is only used for the corpse tile but I decided to add it anyway, especially as I'm considering using that for the base merfolk and the current fighter one for the impaler. --- crawl-ref/source/tilepick.cc | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'crawl-ref/source/tilepick.cc') diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index ec4b758bdc..d516e20b73 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -276,13 +276,25 @@ 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; + return TILEP_MONS_MERFOLK_WATER; else - return TILEP_MONS_MERFOLK_FIGHTER; + return TILEP_MONS_MERFOLK; + case MONS_MERFOLK_IMPALER: + if (in_water) + return TILEP_MONS_MERFOLK_IMPALER_WATER; + else + return TILEP_MONS_MERFOLK_IMPALER; + case MONS_MERFOLK_AQUAMANCER: + if (in_water) + return TILEP_MONS_MERFOLK_AQUAMANCER_WATER; + else + return TILEP_MONS_MERFOLK_AQUAMANCER; + case MONS_MERFOLK_JAVELINEER: + if (in_water) + return TILEP_MONS_MERFOLK_JAVELINEER_WATER; + else + return TILEP_MONS_MERFOLK_JAVELINEER; case MONS_MERMAID: if (in_water) return TILEP_MONS_MERMAID_WATER; @@ -1811,7 +1823,7 @@ static int _tileidx_corpse(const item_def &item) // merfolk ('m') case MONS_MERFOLK: - return TILE_CORPSE_MERFOLK_FIGHTER; + return TILE_CORPSE_MERFOLK; case MONS_MERMAID: return TILE_CORPSE_MERMAID; case MONS_SIREN: -- cgit v1.2.3-54-g00ecf