diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 02:13:58 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-24 02:13:58 +0000 |
| commit | 0336d11218d02515e6964099e58e5b524f131d6b (patch) | |
| tree | 2d78046ab358d185ebfd43156146116d3f3fed99 | |
| parent | 26f4800dbef2e4fe0ed7b820c848827cbfc35b76 (diff) | |
| download | crawl-ref-0336d11218d02515e6964099e58e5b524f131d6b.tar.gz crawl-ref-0336d11218d02515e6964099e58e5b524f131d6b.zip | |
Adding graphic for neutral monsters. (A smiley face.)
Fixing a magic mapping issue.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3849 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/rltiles/dc-misc.txt | 1 | ||||
| -rw-r--r-- | crawl-ref/source/rltiles/dc-misc/neutral.bmp | bin | 0 -> 2102 bytes | |||
| -rw-r--r-- | crawl-ref/source/tile2.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/tiles.h | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 91f6a68ca4..8e3a566ced 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -55,6 +55,7 @@ cursor_red CURSOR2 cursor_green CURSOR3
%rim 1
heart HEART
+neutral NEUTRAL
poison POISON
%rim 0
may_stab_brand MAY_STAB_BRAND
diff --git a/crawl-ref/source/rltiles/dc-misc/neutral.bmp b/crawl-ref/source/rltiles/dc-misc/neutral.bmp Binary files differnew file mode 100644 index 0000000000..153f6a2fa8 --- /dev/null +++ b/crawl-ref/source/rltiles/dc-misc/neutral.bmp diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index 1da3ced842..c2b2ae07ca 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -762,9 +762,8 @@ void _tcache_compose_normal(int ix, int *fg, int *bg) } else if ((fg0 & TILE_FLAG_MAY_STAB) == TILE_FLAG_NEUTRAL) { - // FIX ME: add real neutral marker! - tcache_overlay(tc_img, ix, TILE_NEW_STAIR, TREGION_0_NORMAL, &c, NULL); - status_shift += 10; + tcache_overlay(tc_img, ix, TILE_NEUTRAL, TREGION_0_NORMAL, &c, NULL); + status_shift += 8; } else if ((fg0 & TILE_FLAG_MAY_STAB) == TILE_FLAG_STAB) { diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index 3ccf159829..b1db1c39d6 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -151,9 +151,8 @@ enum tile_flags // Background flags TILE_FLAG_RAY = 0x00000800, - TILE_FLAG_MM_UNSEEN = 0x00000000, - TILE_FLAG_UNSEEN = 0x00001000, - TILE_FLAG_CURSOR0 = 0x00002000, + TILE_FLAG_MM_UNSEEN = 0x00001000, + TILE_FLAG_UNSEEN = 0x00002000, TILE_FLAG_CURSOR1 = 0x00004000, TILE_FLAG_CURSOR2 = 0x00008000, TILE_FLAG_CURSOR3 = 0x0000C000, |
