summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-09-09 23:57:47 +0000
committertruelight <truelight@openttd.org>2007-09-09 23:57:47 +0000
commitab880fdf071a0f1490605bf8b7b16004ce65cc5d (patch)
tree4fed618098c70610f7b07dcdad944fa4de139689
parent3c31722825fd17ccc787348f153d7e54966b131f (diff)
downloadopenttd-ab880fdf071a0f1490605bf8b7b16004ce65cc5d.tar.xz
(svn r11080) -Fix r11079: fix it, still dirty, correctly, as the last commit was ... wrong ;)
-rw-r--r--src/blitter/32bpp_anim.cpp23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp
index 7bbad66ee..0e2fe7969 100644
--- a/src/blitter/32bpp_anim.cpp
+++ b/src/blitter/32bpp_anim.cpp
@@ -21,7 +21,7 @@ void Blitter_32bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL
this->anim_buf_width = _screen.width;
this->anim_buf_height = _screen.height;
}
- anim_end = this->anim_buf + this->anim_buf_width + this->anim_buf_height * this->anim_buf_width;
+ anim_end = this->anim_buf + this->anim_buf_height * this->anim_buf_width - 1;
/* Find where to start reading in the source sprite */
src_line = (const SpriteLoader::CommonPixel *)bp->sprite + (bp->skip_top * bp->sprite_width + bp->skip_left) * ScaleByZoom(1, zoom);
@@ -37,6 +37,9 @@ void Blitter_32bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL
anim = anim_line;
anim_line += this->anim_buf_width;
+ /* Don't allow values of 'anim' greater than 'anim_end' to avoid buffer overflows.
+ * This only happens when we are doing a big-screenshot, so it should be relative safe */
+ if (anim >= anim_end || anim < this->anim_buf) anim = anim_end;
for (int x = 0; x < bp->width; x++) {
if (src->a == 0) {
@@ -45,8 +48,10 @@ void Blitter_32bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL
dst += skip;
/* Make sure the anim-buffer is cleared */
- if (anim < anim_end) memset(anim, 0, skip);
- anim += skip;
+ if (anim < anim_end - skip) {
+ memset(anim, 0, skip);
+ anim += skip;
+ }
x += skip - 1;
src += ScaleByZoom(1, zoom) * skip;
continue;
@@ -57,11 +62,11 @@ void Blitter_32bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL
/* In case the m-channel is zero, do not remap this pixel in any way */
if (src->m == 0) {
*dst = ComposeColourRGBA(src->r, src->g, src->b, src->a, *dst);
- if (anim < anim_end) *anim = 0;
+ *anim = 0;
} else {
if (bp->remap[src->m] != 0) {
*dst = ComposeColourPA(this->LookupColourInPalette(bp->remap[src->m]), src->a, *dst);
- if (anim < anim_end) *anim = bp->remap[src->m];
+ *anim = bp->remap[src->m];
}
}
break;
@@ -73,18 +78,20 @@ void Blitter_32bppAnim::Draw(Blitter::BlitterParams *bp, BlitterMode mode, ZoomL
/* Make the current color a bit more black, so it looks like this image is transparent */
*dst = MakeTransparent(*dst, 192);
- if (anim < anim_end) *anim = bp->remap[*anim];
+ *anim = bp->remap[*anim];
break;
default:
/* Above 217 is palette animation */
if (src->m >= 217) *dst = ComposeColourPA(this->LookupColourInPalette(src->m), src->a, *dst);
else *dst = ComposeColourRGBA(src->r, src->g, src->b, src->a, *dst);
- if (anim < anim_end) *anim = src->m;
+ *anim = src->m;
break;
}
dst++;
- anim++;
+ /* Don't increase the anim buffer anymore if we tend to run out of the buffer...
+ * This only happens when we are doing a big-screenshot, so it should be relative safe */
+ if (anim < anim_end) anim++;
src += ScaleByZoom(1, zoom);
}
}