diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-23 12:58:27 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-23 12:58:27 +0000 |
| commit | 4b07a28aaab6e548371e9eae8ea5546afe6e4e54 (patch) | |
| tree | 40c2380d8fdc25f9f5d1b8cf62140f99cc430787 /crawl-ref/source/tile2.cc | |
| parent | 4bb492c640354a968b77a3d4f9bf0ebfd3a31ba1 (diff) | |
| download | crawl-ref-4b07a28aaab6e548371e9eae8ea5546afe6e4e54.tar.gz crawl-ref-4b07a28aaab6e548371e9eae8ea5546afe6e4e54.zip | |
Replace cloak of Starlight tile with Eino's improved version.
Add background tiles for TSO halo. I've tried around with several
versions, and this is the best of those I came up with. It might still
be annoying, or distracting, or whatever. Also, the player doll's shadow
hides part of the halo which is weird.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4529 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile2.cc')
| -rw-r--r-- | crawl-ref/source/tile2.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index 09d309d02c..acd4f9e41f 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -661,15 +661,18 @@ void _tcache_compose_normal(int ix, int *fg, int *bg) if (new_bg) _tcache_overlay(tcache_image, ix, new_bg, &c, NULL); + if (bg0 & TILE_FLAG_HALO_YOU) + _tcache_overlay(tcache_image, ix, TILE_HALO_PLAYER, &c, NULL); + else if (bg0 & TILE_FLAG_HALO) + _tcache_overlay(tcache_image, ix, TILE_HALO, &c, NULL); + if ((bg0 & TILE_FLAG_SANCTUARY) && !(bg0 & TILE_FLAG_UNSEEN)) _tcache_overlay(tcache_image, ix, TILE_SANCTUARY, &c, NULL); // Apply the travel exclusion under the foreground if the cell is // visible. It will be applied later if the cell is unseen. if ((bg0 & TILE_FLAG_TRAVEL_EX) && !(bg0 & TILE_FLAG_UNSEEN)) - { _tcache_overlay(tcache_image, ix, TILE_TRAVEL_EXCLUSION, &c, NULL); - } if (bg0 & TILE_FLAG_RAY) _tcache_overlay(tcache_image, ix, TILE_RAY_MESH, &c, NULL); @@ -691,9 +694,7 @@ void _tcache_compose_normal(int ix, int *fg, int *bg) _tcache_overlay(tcache_image, ix, TILE_TRAP_NET, &c, NULL); if (fg0 & TILE_FLAG_S_UNDER) - { _tcache_overlay(tcache_image, ix, TILE_SOMETHING_UNDER, &c, NULL); - } // Pet mark int status_shift = 0; @@ -740,9 +741,7 @@ void _tcache_compose_normal(int ix, int *fg, int *bg) // Don't let the "new stair" icon cover up any existing icons, but // draw it otherwise. if (bg0 & TILE_FLAG_NEW_STAIR && status_shift == 0) - { _tcache_overlay(tcache_image, ix, TILE_NEW_STAIR, &c, NULL); - } if ((bg0 & TILE_FLAG_TRAVEL_EX) && (bg0 & TILE_FLAG_UNSEEN)) { |