Merge branch 'unicode-tiles'

It lacks an actual font yet, but I realized we need to check if drivers
people use actually support sub-textures -- and if not, there'll be some
rethinking needed.

1 files changed, 1 insertions, 1 deletions

diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h
index f150a5b2d4..95fd4607ed 100644
--- a/crawl-ref/source/tiletex.h
+++ b/crawl-ref/source/tiletex.h
@@ -27,7 +27,7 @@ public:
                       tex_proc_func proc = NULL,
                       bool force_power_of_two = true);
     bool load_texture(unsigned char *pixels, unsigned int w, unsigned int h,
-                      MipMapOptions mip_opt);
+                      MipMapOptions mip_opt, int offsetx=-1, int offsety=-1);
     void unload_texture();
 
     unsigned int width() const { return m_width; }