summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-10 22:16:58 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-10 22:16:58 +0000
commitd5bfb320fb5aa1a2f58de3846953357abfae1d11 (patch)
tree69850c988153288abd01578f91f69c7c546851ef
parent6ab8bec6b7eeee59b9bdb946aba467ef9b9d69e5 (diff)
downloadcrawl-ref-d5bfb320fb5aa1a2f58de3846953357abfae1d11.tar.gz
crawl-ref-d5bfb320fb5aa1a2f58de3846953357abfae1d11.zip
[2498067] Fixing tiles menu graphics.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8399 c06c8d41-db1a-0410-9941-cceddc491573
-rw-r--r--crawl-ref/source/tilebuf.cc2
-rw-r--r--crawl-ref/source/tilebuf.h2
-rw-r--r--crawl-ref/source/tilereg.cc3
3 files changed, 4 insertions, 3 deletions
diff --git a/crawl-ref/source/tilebuf.cc b/crawl-ref/source/tilebuf.cc
index c08f0beaa3..241673c02f 100644
--- a/crawl-ref/source/tilebuf.cc
+++ b/crawl-ref/source/tilebuf.cc
@@ -142,7 +142,7 @@ TileBuffer::TileBuffer(const TilesTexture *t) : VertBuffer<PTVert>(t, GL_QUADS)
{
}
-void TileBuffer::add(int idx, float x, float y)
+void TileBuffer::add_unscaled(int idx, float x, float y)
{
const tile_info &inf = ((TilesTexture*)m_tex)->get_info(idx);
diff --git a/crawl-ref/source/tilebuf.h b/crawl-ref/source/tilebuf.h
index 99897a6fe2..f3599b93d1 100644
--- a/crawl-ref/source/tilebuf.h
+++ b/crawl-ref/source/tilebuf.h
@@ -90,7 +90,7 @@ class TileBuffer : public VertBuffer<PTVert>
public:
TileBuffer(const TilesTexture *tex = NULL);
- void add(int idx, float x, float y);
+ void add_unscaled(int idx, float x, float y);
void add(int idx, int x, int y, int ox = 0, int oy = 0, bool centre = true, int ymax = -1);
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc
index 789e1575fc..bfc0b95f30 100644
--- a/crawl-ref/source/tilereg.cc
+++ b/crawl-ref/source/tilereg.cc
@@ -2490,7 +2490,8 @@ void MenuRegion::place_entries()
// a dungeon tile over a monster tile.
int tile = m_entries[i].tiles[t].tile;
TextureID tex = m_entries[i].tiles[t].tex;
- m_tile_buf[tex].add(tile, m_entries[i].sx, m_entries[i].sy);
+ m_tile_buf[tex].add_unscaled(tile, m_entries[i].sx,
+ m_entries[i].sy);
}
}
else