dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r9835) -Codechange: use Pixel typedef instead of byte where ever possible

Browse Source
This commit is contained in:
truelight
2007-05-14 15:20:50 +00:00
parent 62fe9c2e42
commit d7b4fb80d0
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gfx.cpp
View File

@@ -64,12 +64,12 @@ static byte _dirty_blocks[DIRTY_BYTES_PER_LINE * MAX_SCREEN_HEIGHT / 8];
void memcpy_pitch(void *dst, void *src, int w, int h, int srcpitch, int dstpitch)
{
byte *dstp = (byte*)dst;
byte *srcp = (byte*)src;
Pixel *dstp = (Pixel *)dst;
Pixel *srcp = (Pixel *)src;
assert(h >= 0);
for (; h != 0; --h) {
memcpy(dstp, srcp, w);
memcpy(dstp, srcp, w * sizeof(Pixel));
dstp += dstpitch;
srcp += srcpitch;
}
@@ -110,7 +110,7 @@ void GfxScroll(int left, int top, int width, int height, int xo, int yo)
}
for (ht = height; ht > 0; --ht) {
memcpy(dst, src, width);
memcpy(dst, src, width * sizeof(Pixel));
src -= p;
dst -= p;
}
@@ -136,7 +136,7 @@ void GfxScroll(int left, int top, int width, int height, int xo, int yo)
/* the y-displacement may be 0 therefore we have to use memmove,
* because source and destination may overlap */
for (ht = height; ht > 0; --ht) {
memmove(dst, src, width);
memmove(dst, src, width * sizeof(Pixel));
src += p;
dst += p;
}
@@ -175,7 +175,7 @@ void GfxFillRect(int left, int top, int right, int bottom, int color)
if (!HASBIT(color, PALETTE_MODIFIER_GREYOUT)) {
if (!HASBIT(color, USE_COLORTABLE)) {
do {
memset(dst, color, right);
memset(dst, color, right * sizeof(Pixel));
dst += dpi->pitch;
} while (--bottom);
} else {