diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-08 03:50:16 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-08 03:50:16 +0000 |
| commit | 3fe0cf688e2dad0503dbb31dd43cfe3bd1fa6536 (patch) | |
| tree | ea81fae6b4ff16c40bfb2acac9eb85433fb80d9a /crawl-ref/source/tiletex.h | |
| parent | bac007c9138e659d34646952fb98afc056ec279c (diff) | |
| download | crawl-ref-3fe0cf688e2dad0503dbb31dd43cfe3bd1fa6536.tar.gz crawl-ref-3fe0cf688e2dad0503dbb31dd43cfe3bd1fa6536.zip | |
Clean up tiles code to use the VertBuffer classes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8321 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tiletex.h')
| -rw-r--r-- | crawl-ref/source/tiletex.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h index 9299305789..cc07a6326d 100644 --- a/crawl-ref/source/tiletex.h +++ b/crawl-ref/source/tiletex.h @@ -12,8 +12,8 @@ enum TextureID { TEX_DUNGEON, - TEX_DEFAULT, TEX_DOLL, + TEX_DEFAULT, TEX_MAX }; @@ -64,20 +64,20 @@ public: TilesTexture(); void set_info(int max, tile_info_func *info); - inline const tile_info &get_info(int idx); + inline const tile_info &get_info(int idx) const; inline void get_coords(int idx, int ofs_x, int ofs_y, float &pos_sx, float &pos_sy, float &pos_ex, float &pos_ey, float &tex_sx, float &tex_sy, float &tex_ex, float &tex_ey, - bool centre = true, int ymax = -1); + bool centre = true, int ymax = -1) const; protected: int m_tile_max; tile_info_func *m_info_func; }; -inline const tile_info &TilesTexture::get_info(int idx) +inline const tile_info &TilesTexture::get_info(int idx) const { ASSERT(m_info_func); return m_info_func(idx); @@ -88,7 +88,7 @@ inline void TilesTexture::get_coords(int idx, int ofs_x, int ofs_y, float &pos_ex, float &pos_ey, float &tex_sx, float &tex_sy, float &tex_ex, float &tex_ey, - bool centre, int ymax) + bool centre, int ymax) const { const tile_info &inf = get_info(idx); |