diff options
author | tron <tron@openttd.org> | 2005-07-11 15:47:20 +0000 |
---|---|---|
committer | tron <tron@openttd.org> | 2005-07-11 15:47:20 +0000 |
commit | 1780afa4c8721aa20804bc2404f690d02f1dcfde (patch) | |
tree | eb2cccd7a85a01b6f03889684087fa8a0bba3e58 | |
parent | a2c6ccb0d91c4f53e9d774a2dc054a948ac1ea44 (diff) | |
download | openttd-1780afa4c8721aa20804bc2404f690d02f1dcfde.tar.xz |
(svn r2546) Don't calculate a value which never gets used and simplify some calculations
-rw-r--r-- | gfx.c | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -1351,30 +1351,25 @@ static void GfxMainBlitter(const Sprite* sprite, int x, int y, int mode) bp.dst += bp.pitch * (y >> dpi->zoom); } - if ( (y = y + bp.height - dpi->height) > 0) { - bp.height -= y; + if (bp.height > dpi->height - y) { + bp.height = dpi->height - y; if (bp.height <= 0) return; } - start_x = 0; - x &= zoom_mask; if ( (x -= dpi->left) < 0) { bp.width += x; if (bp.width <= 0) return; - start_x -= x; bp.sprite -= x; x = 0; } bp.dst += x >> dpi->zoom; - if ( (x = x + bp.width - dpi->width) > 0) { - bp.width -= x; + if (bp.width > dpi->width - x) { + bp.width = dpi->width - x; if (bp.width <= 0) return; - start_x += x; } - bp.start_x = start_x; zf_uncomp[dpi->zoom](&bp); } |