From ba15bdad80f10dc07f829c14fa6557652caa083f Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 9 Mar 2009 09:46:44 +0000 Subject: * Add tile for Sonja. * Display wielded weapons for zombies, Sonja, Ilsuiw and Saint Roka. * Reorder get_weapon_offset() to be more logical. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9394 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/tilepick.cc | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'crawl-ref/source/tilepick.cc') diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index ab9f67a587..36365ff298 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -914,7 +914,7 @@ static int _tileidx_monster_base(const monsters *mon, bool detected) case MONS_ROXANNE: return TILEP_MONS_ROXANNE; case MONS_SONJA: - return TILEP_MONS_KOBOLD; // TODO enne + return TILEP_MONS_SONJA; case MONS_AZRAEL: return TILEP_MONS_AZRAEL; case MONS_ILSUIW: @@ -4036,18 +4036,12 @@ void tile_init_flavour(const coord_def &gc) env.tile_flv(gc).special = target - TILE_DNGN_CLOSED_DOOR; } else - { env.tile_flv(gc).special = 0; - } } else if (grd(gc) == DNGN_SECRET_DOOR) - { env.tile_flv(gc).special = 0; - } else if (!env.tile_flv(gc).special) - { env.tile_flv(gc).special = random2(256); - } } static bool _adjacent_target(dungeon_feature_type target, int x, int y) @@ -4058,10 +4052,10 @@ static bool _adjacent_target(dungeon_feature_type target, int x, int y) if (!map_bounds(x+i, y+j)) continue; if (grd[x+i][y+j] == target) - return true; + return (true); } - return false; + return (false); } void tile_floor_halo(dungeon_feature_type target, int tile) -- cgit v1.2.3-54-g00ecf