Refactor crawl view buffer.

Rather than using explicit offsets (e.g. buffy[0] and buffy[1]), store
colour, glyph, and tiles for each cell in the view buffer in a struct
with named members.  This refactoring will also theoretically allow for
the tiles version to display glyphs instead of tiles.

1 files changed, 8 insertions, 6 deletions

diff --git a/crawl-ref/source/libw32c.cc b/crawl-ref/source/libw32c.cc
index 1431ea7bb7..5bdc5b4fc9 100644
--- a/crawl-ref/source/libw32c.cc
+++ b/crawl-ref/source/libw32c.cc
@@ -916,16 +916,18 @@ int get_console_string(char *buf, int maxlen)
     return (int)nread;
 }
 
-void puttext(int x1, int y1, int x2, int y2, const screen_buffer_t *buf)
+void puttext(int x1, int y1, const crawl_view_buffer &vbuf)
 {
-    for (int y = y1; y <= y2; ++y)
+    const screen_cell_t *cell = vbuf;
+    const coord_def size = vbuf.size();
+    for (int y = 1; y <= size.y; ++y)
     {
         cgotoxy(x1, y);
-        for (int x = x1; x <= x2; x++)
+        for (int x = 1; x <= size.x; ++x)
         {
-            textattr( buf[1] );
-            putwch( *buf );
-            buf += 2;
+            textattr(cell->colour);
+            putwch(cell->glyph);
+            cell++;
         }
     }
     update_screen();