From 6f2fb6552309ec39ec8a461ffd03595b10a860dc Mon Sep 17 00:00:00 2001 From: ennewalker Date: Thu, 24 Apr 2008 12:26:46 +0000 Subject: Moving player halo into the player tiles so that it can be layered on top of the shadow. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4587 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/rltiles/dc-misc.txt | 1 - crawl-ref/source/rltiles/dc-misc/halo_player.bmp | Bin 2102 -> 0 bytes crawl-ref/source/rltiles/dc-pl.txt | 11 +++++++++++ crawl-ref/source/rltiles/player/halo/halo_player.bmp | Bin 0 -> 2102 bytes crawl-ref/source/tile1.cc | 7 +------ crawl-ref/source/tile2.cc | 11 +++++++---- crawl-ref/source/tiles.h | 9 ++++----- 7 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 crawl-ref/source/rltiles/dc-misc/halo_player.bmp create mode 100644 crawl-ref/source/rltiles/player/halo/halo_player.bmp (limited to 'crawl-ref/source') diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt index 1484827df0..acb230214a 100644 --- a/crawl-ref/source/rltiles/dc-misc.txt +++ b/crawl-ref/source/rltiles/dc-misc.txt @@ -29,7 +29,6 @@ sanctuary SANCTUARY #########MAP %sdir dc-misc -halo_player HALO_PLAYER halo HALO %corpse 0 %back none diff --git a/crawl-ref/source/rltiles/dc-misc/halo_player.bmp b/crawl-ref/source/rltiles/dc-misc/halo_player.bmp deleted file mode 100644 index edfbc158c6..0000000000 Binary files a/crawl-ref/source/rltiles/dc-misc/halo_player.bmp and /dev/null differ diff --git a/crawl-ref/source/rltiles/dc-pl.txt b/crawl-ref/source/rltiles/dc-pl.txt index a3925c2b27..af130b5e05 100644 --- a/crawl-ref/source/rltiles/dc-pl.txt +++ b/crawl-ref/source/rltiles/dc-pl.txt @@ -100,6 +100,17 @@ centaur_barding_magenta CENTAUR_BARDING_MAGENTA centaur_barding_red CENTAUR_BARDING_RED %end +%parts_ctg HALO +%parts_wx 32 +%parts_wy 32 +%parts_ox 0 +%parts_oy 0 +%rim 0 +%sdir player/halo +halo_player TSO +%rim 1 +%end + ###Cloak %parts_ctg CLOAK %parts_wx 32 diff --git a/crawl-ref/source/rltiles/player/halo/halo_player.bmp b/crawl-ref/source/rltiles/player/halo/halo_player.bmp new file mode 100644 index 0000000000..edfbc158c6 Binary files /dev/null and b/crawl-ref/source/rltiles/player/halo/halo_player.bmp differ diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index f713d9f726..b8ed61ebad 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -4097,12 +4097,7 @@ void tile_finish_dngn(unsigned int *tileb, int cx, int cy) bool print_blood = true; if (inside_halo(gx, gy)) { - if (gx == you.x_pos && gy == you.y_pos) - { - tileb[count+1] |= TILE_FLAG_HALO_YOU; - print_blood = false; - } - else if (see_grid(gx, gy) && mgrd[gx][gy] != NON_MONSTER) + if (see_grid(gx, gy) && mgrd[gx][gy] != NON_MONSTER) { monsters* m = &menv[mgrd[gx][gy]]; if (!mons_class_flag(m->type, M_NO_EXP_GAIN) diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index acd4f9e41f..920e8229ac 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -23,6 +23,7 @@ #include "it_use2.h" #include "place.h" #include "player.h" +#include "spells3.h" #include "stuff.h" #include "tiles.h" #include "tilecount-w2d.h" @@ -661,8 +662,6 @@ 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); @@ -1240,6 +1239,7 @@ static bool _draw_doll(img_type img, dolls_data *doll, bool force_redraw = false const int p_order[TILEP_PARTS_TOTAL] = { TILEP_PART_SHADOW, + TILEP_PART_HALO, TILEP_PART_DRCWING, TILEP_PART_CLOAK, TILEP_PART_BASE, @@ -1279,6 +1279,9 @@ static bool _draw_doll(img_type img, dolls_data *doll, bool force_redraw = false // TODO enne - make these configurable. parts[TILEP_PART_DRCHEAD] = default_parts[TILEP_PART_DRCHEAD]; parts[TILEP_PART_DRCWING] = default_parts[TILEP_PART_DRCWING]; + + bool halo = inside_halo(you.x_pos, you.y_pos); + parts[TILEP_PART_HALO] = halo ? TILEP_HALO_TSO : 0; } // convert TILEP_SHOW_EQUIP into real parts number @@ -1409,8 +1412,8 @@ static bool _draw_doll(img_type img, dolls_data *doll, bool force_redraw = false // swap boot and leg-armor if (parts2[TILEP_PART_LEG] < TILEP_LEG_SKIRT_OFS) { - p_order2[5] = TILEP_PART_LEG; - p_order2[4] = TILEP_PART_BOOTS; + p_order2[6] = TILEP_PART_LEG; + p_order2[5] = TILEP_PART_BOOTS; } for (i = 0; i < TILEP_PARTS_TOTAL; i++) diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h index 20d7320e29..d3cd951c6e 100644 --- a/crawl-ref/source/tiles.h +++ b/crawl-ref/source/tiles.h @@ -158,11 +158,10 @@ enum tile_flags TILE_FLAG_CURSOR3 = 0x0000C000, TILE_FLAG_CURSOR = 0x0000C000, TILE_FLAG_BLOOD = 0x00010000, - TILE_FLAG_HALO_YOU = 0x00020000, - TILE_FLAG_HALO = 0x00040000, - TILE_FLAG_NEW_STAIR = 0x00080000, - TILE_FLAG_TRAVEL_EX = 0x00100000, - TILE_FLAG_SANCTUARY = 0x00200000, + TILE_FLAG_HALO = 0x00020000, + TILE_FLAG_NEW_STAIR = 0x00040000, + TILE_FLAG_TRAVEL_EX = 0x00080000, + TILE_FLAG_SANCTUARY = 0x00100000, // General TILE_FLAG_MASK = 0x000007FF -- cgit v1.2.3-54-g00ecf