diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-10 23:09:52 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-10 23:09:52 +0000 |
| commit | a528b7387d4f5a715389330277ebd62600d8fe46 (patch) | |
| tree | 107986020bbb6e06e73a1f00295901c68db0bbf5 /crawl-ref/source/tilereg.cc | |
| parent | e27e2c60f9fdda7119ec366632d4dc3e9707f20d (diff) | |
| download | crawl-ref-a528b7387d4f5a715389330277ebd62600d8fe46.tar.gz crawl-ref-a528b7387d4f5a715389330277ebd62600d8fe46.zip | |
[2495807] Fixing overlay color when walking through green water.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8402 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilereg.cc')
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 97fd34bb53..9193ea8749 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -493,30 +493,16 @@ void DungeonRegion::pack_foreground(unsigned int bg, unsigned int fg, int x, int if (fg_idx && !(fg & TILE_FLAG_FLYING)) { - if (bg_idx >= TILE_DNGN_LAVA && bg_idx <= TILE_DNGN_LAVA + 3) - { + if (tile_dngn_equal(TILE_DNGN_LAVA, bg_idx)) m_buf_main.add(TILE_MASK_LAVA, x, y); - } - else if (bg_idx >= TILE_DNGN_SHALLOW_WATER - && bg_idx <= TILE_DNGN_SHALLOW_WATER + 3) - { + else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER, bg_idx)) m_buf_main.add(TILE_MASK_SHALLOW_WATER, x, y); - } - else if (bg_idx >= TILE_DNGN_SHALLOW_WATER_MURKY - && bg_idx <= TILE_DNGN_SHALLOW_WATER_MURKY+ 3) - { + else if (tile_dngn_equal(TILE_DNGN_SHALLOW_WATER_MURKY, bg_idx)) m_buf_main.add(TILE_MASK_SHALLOW_WATER_MURKY, x, y); - } - else if (bg_idx >= TILE_DNGN_DEEP_WATER - && bg_idx <= TILE_DNGN_DEEP_WATER + 3) - { + else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER, bg_idx)) m_buf_main.add(TILE_MASK_DEEP_WATER, x, y); - } - else if (bg_idx >= TILE_DNGN_DEEP_WATER_MURKY - && bg_idx <= TILE_DNGN_DEEP_WATER_MURKY + 3) - { + else if (tile_dngn_equal(TILE_DNGN_DEEP_WATER_MURKY, bg_idx)) m_buf_main.add(TILE_MASK_DEEP_WATER_MURKY, x, y); - } } if (fg & TILE_FLAG_NET) |