mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r2502) Small cleanup

release/0.4.5
tron 2005-06-30 19:49:01 +00:00
parent 75bb548da4
commit c92e85a357
1 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
gfx.c
View File

@ -738,12 +738,12 @@ static void GfxBlitZoomInUncomp(BlitterParams *bp)
if (bp->mode & 1) { if (bp->mode & 1) {
if (bp->info & 1) { if (bp->info & 1) {
const byte *ctab = _color_remap_ptr; const byte *ctab = _color_remap_ptr;
byte b;
do { do {
for(i=0; i!=width; i++) { for (i = 0; i != width; i++) {
if ((b=ctab[src[i]]) != 0) byte b = ctab[src[i]];
dst[i] = b;
if (b != 0) dst[i] = b;
} }
src += bp->width_org; src += bp->width_org;
dst += bp->pitch; dst += bp->pitch;
@ -754,9 +754,8 @@ static void GfxBlitZoomInUncomp(BlitterParams *bp)
const byte *ctab = _color_remap_ptr; const byte *ctab = _color_remap_ptr;
do { do {
for(i=0; i!=width; i++) for (i = 0; i != width; i++)
if (src[i]) if (src[i] != 0) dst[i] = ctab[dst[i]];
dst[i] = ctab[dst[i]];
src += bp->width_org; src += bp->width_org;
dst += bp->pitch; dst += bp->pitch;
} while (--height); } while (--height);
@ -772,10 +771,10 @@ static void GfxBlitZoomInUncomp(BlitterParams *bp)
do { do {
int n = width; int n = width;
while (n >= 4) { while (n >= 4) {
if (src[0]) dst[0] = src[0]; if (src[0] != 0) dst[0] = src[0];
if (src[1]) dst[1] = src[1]; if (src[1] != 0) dst[1] = src[1];
if (src[2]) dst[2] = src[2]; if (src[2] != 0) dst[2] = src[2];
if (src[3]) dst[3] = src[3]; if (src[3] != 0) dst[3] = src[3];
dst += 4; dst += 4;
src += 4; src += 4;
@ -783,7 +782,7 @@ static void GfxBlitZoomInUncomp(BlitterParams *bp)
} }
while (n) { while (n) {
if (src[0]) dst[0] = src[0]; if (src[0] != 0) dst[0] = src[0];
src++; src++;
dst++; dst++;
n--; n--;
@ -989,40 +988,36 @@ static void GfxBlitZoomMediumUncomp(BlitterParams *bp)
if (bp->mode & 1) { if (bp->mode & 1) {
if (bp->info & 1) { if (bp->info & 1) {
const byte *ctab = _color_remap_ptr; const byte *ctab = _color_remap_ptr;
byte b;
height >>= 1; for (height >>= 1; height != 0; height--) {
if (height) do { for (i = 0; i != width >> 1; i++) {
for(i=0; i!=width>>1; i++) byte b = ctab[src[i * 2]];
if ((b=ctab[src[i*2]]) != 0)
dst[i] = b; if (b != 0) dst[i] = b;
}
src += bp->width_org * 2; src += bp->width_org * 2;
dst += bp->pitch; dst += bp->pitch;
} while (--height); }
} }
} else if (bp->mode & 2) { } else if (bp->mode & 2) {
if (bp->info & 1) { if (bp->info & 1) {
const byte *ctab = _color_remap_ptr; const byte *ctab = _color_remap_ptr;
height >>= 1; for (height >>= 1; height != 0; height--) {
if (height) do { for (i = 0; i != width >> 1; i++)
for(i=0; i!=width>>1; i++) if (src[i * 2] != 0) dst[i] = ctab[dst[i]];
if (src[i*2])
dst[i] = ctab[dst[i]];
src += bp->width_org * 2; src += bp->width_org * 2;
dst += bp->pitch; dst += bp->pitch;
} while (--height); }
} }
} else { } else {
if (bp->info & 1) { if (bp->info & 1) {
height >>= 1; for (height >>= 1; height != 0; height--) {
if (height) do { for (i = 0; i != width >> 1; i++)
for(i=0; i!=width>>1; i++) if (src[i * 2] != 0) dst[i] = src[i * 2];
if (src[i*2])
dst[i] = src[i*2];
src += bp->width_org * 2; src += bp->width_org * 2;
dst += bp->pitch; dst += bp->pitch;
} while (--height); }
} }
} }
} }
@ -1285,40 +1280,36 @@ static void GfxBlitZoomOutUncomp(BlitterParams *bp)
if (bp->mode & 1) { if (bp->mode & 1) {
if (bp->info & 1) { if (bp->info & 1) {
const byte *ctab = _color_remap_ptr; const byte *ctab = _color_remap_ptr;
byte b;
height >>= 2; for (height >>= 2; height != 0; height--) {
if (height) do { for (i = 0; i != width >> 2; i++) {
for(i=0; i!=width>>2; i++) byte b = ctab[src[i * 4]];
if ((b=ctab[src[i*4]]) != 0)
dst[i] = b; if (b != 0) dst[i] = b;
}
src += bp->width_org * 4; src += bp->width_org * 4;
dst += bp->pitch; dst += bp->pitch;
} while (--height); }
} }
} else if (bp->mode & 2) { } else if (bp->mode & 2) {
if (bp->info & 1) { if (bp->info & 1) {
const byte *ctab = _color_remap_ptr; const byte *ctab = _color_remap_ptr;
height >>= 2; for (height >>= 2; height != 0; height--) {
if (height) do { for (i = 0; i != width >> 2; i++)
for(i=0; i!=width>>2; i++) if (src[i * 4] != 0) dst[i] = ctab[dst[i]];
if (src[i*4])
dst[i] = ctab[dst[i]];
src += bp->width_org * 4; src += bp->width_org * 4;
dst += bp->pitch; dst += bp->pitch;
} while (--height); }
} }
} else { } else {
if (bp->info & 1) { if (bp->info & 1) {
height >>= 2; for (height >>= 2; height != 0; height--) {
if (height) do { for (i = 0; i != width >> 2; i++)
for(i=0; i!=width>>2; i++) if (src[i * 4] != 0) dst[i] = src[i * 4];
if (src[i*4])
dst[i] = src[i*4];
src += bp->width_org * 4; src += bp->width_org * 4;
dst += bp->pitch; dst += bp->pitch;
} while (--height); }
} }
} }
} }