summaryrefslogtreecommitdiff
path: root/gfx.c
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-09-02 20:34:04 +0000
committertron <tron@openttd.org>2006-09-02 20:34:04 +0000
commite3d00af21eec2acdfb85716c7be0346f4bb7231b (patch)
tree70b19f3d23d0aa9b8e42aaf03b20cab4c2dd5191 /gfx.c
parentab523bb59f0c2c3beef6b7a87070a2c2a1e4d981 (diff)
downloadopenttd-e3d00af21eec2acdfb85716c7be0346f4bb7231b.tar.xz
(svn r6346) -Codechange: Remove redundant assignment
Diffstat (limited to 'gfx.c')
-rw-r--r--gfx.c46
1 files changed, 44 insertions, 2 deletions
diff --git a/gfx.c b/gfx.c
index d0f6fd044..1cb54b462 100644
--- a/gfx.c
+++ b/gfx.c
@@ -190,7 +190,7 @@ void GfxDrawLine(int x, int y, int x2, int y2, int color)
// Check clipping first
{
- DrawPixelInfo *dpi = _cur_dpi;
+ const DrawPixelInfo *dpi = _cur_dpi;
int t;
if (x < dpi->left && x2 < dpi->left) return;
@@ -560,7 +560,7 @@ int GetStringWidth(const char *str)
int DoDrawString(const char *string, int x, int y, uint16 real_color)
{
- DrawPixelInfo *dpi = _cur_dpi;
+ const DrawPixelInfo *dpi = _cur_dpi;
FontSize size = _cur_fontsize;
byte c;
byte color;
@@ -753,6 +753,47 @@ static void GfxBlitTileZoomIn(BlitterParams *bp)
break;
default:
+#if 0
+ src = src_o;
+ do {
+ int offs = bp->start_x;
+
+ dst = bp->dst;
+ for (src = src_o;; src += num + 2) {
+ skip = src[1];
+ if (skip >= offs) {
+ dst += skip;
+ break;
+ }
+ offs -= skip;
+
+ done = src[0];
+ num = done & 0x7F;
+ if (num > offs) {
+ src += offs;
+ dst += offs;
+ num -= offs;
+ break;
+ }
+ }
+
+ src += 2;
+
+ for (;;) {
+ do {
+ *dst++ = *src++;
+ } while (--num != 0);
+
+ if (done & 0x80) break;
+
+ done = *src++;
+ num = done & 0x7F;
+ dst += *src++;
+ }
+
+ bp->dst += bp->pitch;
+ } while (--bp->height != 0);
+#else
do {
do {
done = src_o[0];
@@ -794,6 +835,7 @@ static void GfxBlitTileZoomIn(BlitterParams *bp)
bp->dst += bp->pitch;
} while (--bp->height != 0);
+#endif
break;
}
}