summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/viewgeom.h
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2011-01-11 13:03:13 +0100
committerAdam Borowski <kilobyte@angband.pl>2011-01-11 13:03:13 +0100
commite7c3fa432cecc5eeb49d79109033fd85ee3cad2a (patch)
treefe057b8382c66ffccbd6c6a01ce3286b691c2135 /crawl-ref/source/viewgeom.h
parente5001fba77867a842c1b0b192ec6969aab1cf102 (diff)
parentcc071d90f3d21a23526d1f92d055835e3d370d73 (diff)
downloadcrawl-ref-e7c3fa432cecc5eeb49d79109033fd85ee3cad2a.tar.gz
crawl-ref-e7c3fa432cecc5eeb49d79109033fd85ee3cad2a.zip
Merge branch 'master' into unicode
Conflicts galore...
Diffstat (limited to 'crawl-ref/source/viewgeom.h')
-rw-r--r--crawl-ref/source/viewgeom.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/viewgeom.h b/crawl-ref/source/viewgeom.h
index 64f54a09c9..12ffb496fb 100644
--- a/crawl-ref/source/viewgeom.h
+++ b/crawl-ref/source/viewgeom.h
@@ -1,14 +1,15 @@
#ifndef VIEWGEOM_H
#define VIEWGEOM_H
+#include "tiledgnbuf.h"
+
struct screen_cell_t
{
wchar_t glyph;
unsigned short colour; // TODO: check if this is real colour (8 bit)
unsigned short flash_colour;
#ifdef USE_TILE
- tileidx_t tile_fg;
- tileidx_t tile_bg;
+ packed_cell tile;
#endif
};