diff options
| author | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-21 00:32:24 +0000 |
|---|---|---|
| committer | ennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-21 00:32:24 +0000 |
| commit | 3819fb35af26b53733ccfa7fbd8e6fda5d2b7707 (patch) | |
| tree | 4c08b299e4ca5e0f10dc8f6859b92b2deea1fc63 | |
| parent | 5295af15b91c7bf88b9005e3b381ce587bcd2e11 (diff) | |
| download | crawl-ref-3819fb35af26b53733ccfa7fbd8e6fda5d2b7707.tar.gz crawl-ref-3819fb35af26b53733ccfa7fbd8e6fda5d2b7707.zip | |
Fixing centering of title screen image.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9671 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/tiletex.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/tiletex.h | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 5239865c50..01518e0739 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -2836,14 +2836,14 @@ TitleRegion::TitleRegion(int width, int height) : sx = sy = 0; dx = dy = 1; - if (!m_img.load_texture("title.png", GenericTexture::MIPMAP_NONE, NULL, true)) + if (!m_img.load_texture("title.png", GenericTexture::MIPMAP_NONE)) return; // Center wx = width; wy = height; - ox = (wx - m_img.width()) / 2; - oy = (wy - m_img.height()) / 2; + ox = (wx - m_img.orig_width()) / 2; + oy = (wy - m_img.orig_height()) / 2; { PTVert &v = m_buf.get_next(); diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc index 29d3c4caa2..9f01a25456 100644 --- a/crawl-ref/source/tiletex.cc +++ b/crawl-ref/source/tiletex.cc @@ -12,7 +12,9 @@ REVISION("$Rev$"); GenericTexture::GenericTexture() : m_handle(0), m_width(0), - m_height(0) + m_height(0), + m_orig_width(0), + m_orig_height(0) { } @@ -204,6 +206,9 @@ bool GenericTexture::load_texture(const char *filename, if (pixels != img->pixels) delete pixels; + m_orig_width = img->w; + m_orig_height = img->h; + SDL_FreeSurface(img); return (success); diff --git a/crawl-ref/source/tiletex.h b/crawl-ref/source/tiletex.h index 9c689dcbcd..f3e18ca07c 100644 --- a/crawl-ref/source/tiletex.h +++ b/crawl-ref/source/tiletex.h @@ -54,10 +54,16 @@ public: unsigned int height() const { return m_height; } void bind() const; + unsigned int orig_width() const { return m_orig_width; } + unsigned int orig_height() const { return m_orig_height; } + protected: unsigned int m_handle; unsigned int m_width; unsigned int m_height; + + unsigned int m_orig_width; + unsigned int m_orig_height; }; class TilesTexture : public GenericTexture |