summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tiletex.h
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-06 03:13:34 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-06 03:13:34 +0000
commita8a183dca9dfa75807dadc556e84b20aab993ce8 (patch)
treef2dcca4db96304a94b07c9282cd02a71f43f64a3 /crawl-ref/source/tiletex.h
parent7349eedd00eabe85d7e76e457011d48522b97593 (diff)
downloadcrawl-ref-a8a183dca9dfa75807dadc556e84b20aab993ce8.tar.gz
crawl-ref-a8a183dca9dfa75807dadc556e84b20aab993ce8.zip
Tiles mcache improvements. Monsters out of sight are now shown with their last seen equipment. Player ghosts are now drawn correctly again. Denzi's new 48x32 pandemonium demon tiles are now used.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6875 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tiletex.h')
-rw-r--r--crawl-ref/source/tiletex.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h
index 8d90803ef0..0003395bc8 100644
--- a/crawl-ref/source/tiletex.h
+++ b/crawl-ref/source/tiletex.h
@@ -56,7 +56,7 @@ class TilesTexture : public GenericTexture
public:
TilesTexture();
- void set_info(int max, tile_info *info);
+ void set_info(int max, tile_info_func *info);
inline const tile_info &get_info(int idx);
inline void get_coords(int idx, int ofs_x, int ofs_y,
float &pos_sx, float &pos_sy,
@@ -67,13 +67,12 @@ public:
protected:
int m_tile_max;
- tile_info *m_tile_info;
+ tile_info_func *m_info_func;
};
inline const tile_info &TilesTexture::get_info(int idx)
{
- assert(idx < m_tile_max);
- return m_tile_info[idx];
+ return m_info_func(idx);
}
inline void TilesTexture::get_coords(int idx, int ofs_x, int ofs_y,