diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-15 11:32:54 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-15 11:32:54 +0000 |
| commit | 7fce9b7324c77c16c310e76a6d697e6f84fc9398 (patch) | |
| tree | 061bcb63c57c1281473a289e22041cb93259feca /crawl-ref/source/tile2.cc | |
| parent | ead36b3ba490fb199815ccc048ba204e5bbee30e (diff) | |
| download | crawl-ref-7fce9b7324c77c16c310e76a6d697e6f84fc9398.tar.gz crawl-ref-7fce9b7324c77c16c310e76a6d697e6f84fc9398.zip | |
Fix 1948131: Quiver slot name wraps around the screen.
Also fixes tile issues where the inventory was partly covered or not
shown at all.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5844 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile2.cc')
| -rw-r--r-- | crawl-ref/source/tile2.cc | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index 279e5bf378..c4ee319a0c 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -2853,7 +2853,8 @@ void TileDrawInvData(int n, int flag, int *tiles, int *num, int *idx, int *iflags) { int i; - TileRegionClass *r = (flag == REGION_INV1) ? region_item:region_item2; + TileRegionClass *r = (flag == REGION_INV1 ? region_item + : region_item2); r->flag = true; @@ -2869,19 +2870,19 @@ void TileDrawInvData(int n, int flag, int *tiles, int *num, int *idx, if (i == MAX_ITEMLIST) break; - int tile0 = (i>=n) ? -1 : tiles[i]; - int idx0 = (i>=n) ? -1 : idx[i]; + int tile0 = (i >= n) ? -1 : tiles[i]; + int idx0 = (i >= n) ? -1 : idx[i]; char key = (iflags[i] & TILEI_FLAG_FLOOR) ? 0 : index_to_letter(idx[i]); - if ( flag == itemlist_flag - && tile0 == itemlist[i] - && num[i] == itemlist_num[i] - && key == itemlist_key[i] - && idx0 == itemlist_idx[i] - && iflags[i] == itemlist_iflag[i] - && !force_redraw_inv - && i < old_itemlist_n) + if (flag == itemlist_flag + && tile0 == itemlist[i] + && num[i] == itemlist_num[i] + && key == itemlist_key[i] + && idx0 == itemlist_idx[i] + && iflags[i] == itemlist_iflag[i] + && !force_redraw_inv + && i < old_itemlist_n) { continue; } |