summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/tiletex.cc
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-06 01:24:14 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2009-01-06 01:24:14 +0000
commitd91b7c79b321690ca48ec952cd6012b419eb3c03 (patch)
tree748efe10bb91a742523c58f2063f3380b994c0d7 /crawl-ref/source/tiletex.cc
parentb81690b05643d9936b1a5778a2529e16a7eb9854 (diff)
downloadcrawl-ref-d91b7c79b321690ca48ec952cd6012b419eb3c03.tar.gz
crawl-ref-d91b7c79b321690ca48ec952cd6012b419eb3c03.zip
Support colorkey entry in indexed palettes so indexed PNGs get loaded with transparency properly.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8254 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tiletex.cc')
-rw-r--r--crawl-ref/source/tiletex.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/tiletex.cc b/crawl-ref/source/tiletex.cc
index a2b9584066..99d70477c6 100644
--- a/crawl-ref/source/tiletex.cc
+++ b/crawl-ref/source/tiletex.cc
@@ -146,7 +146,7 @@ bool GenericTexture::load_texture(const char *filename,
pixels[dest*4 ] = pal->colors[index].r;
pixels[dest*4 + 1] = pal->colors[index].g;
pixels[dest*4 + 2] = pal->colors[index].b;
- pixels[dest*4 + 3] = 255;
+ pixels[dest*4 + 3] = (index != img->format->colorkey ? 255 : 0);
dest++;
}
while (x++ < new_width)