From 43d9191f4ba2c718d5df92989a1e57fe480974d1 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Wed, 16 Sep 2009 19:46:22 +0000 Subject: Experimentally use Denzi and/or Mitsuhiro's water tiles for the Shoals. It's possible that they make the water look too busy, but maybe I only need to get used to it. Also add some more alternative tiles for the plain dungeon floor and walls, and move around some spell tiles again. Also fix 2844278: melding stacks stat bonuses for Merfolk. Update change log for the starting stat and exclusion changes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10688 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/tilereg.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'crawl-ref/source/tilereg.cc') diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index d73085cd0f..8574d1bcfe 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -804,6 +804,10 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int m_buf_main.add(TILE_MASK_DEEP_WATER, x, y); else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER_MURKY, bg_idx)) m_buf_main.add(TILE_MASK_DEEP_WATER_MURKY, x, y); + else if (tile_dngn_equal(TILE_SHOALS_DEEP_WATER, bg_idx)) + m_buf_main.add(TILE_MASK_DEEP_WATER_SHOALS, x, y); + else if (tile_dngn_equal(TILE_SHOALS_SHALLOW_WATER, bg_idx)) + m_buf_main.add(TILE_MASK_SHALLOW_WATER_SHOALS, x, y); } if (fg & TILE_FLAG_NET) -- cgit v1.2.3-54-g00ecf