petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r3948) - Fix: [ 1415782 ] crash in string code with openbsd/zaurus; alignment issues (thanks Tron for the help). Backport of r3529, r3553 from trunk

Browse Source
This commit is contained in:
Darkvater
2006-03-18 15:12:24 +00:00
parent 8353c1260a
commit 5f2e2ef32a
5 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gfx.c
View File

@@ -698,7 +698,7 @@ static void GfxBlitTileZoomIn(BlitterParams *bp)
const byte* ctab;
if (bp->mode & 1) {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
do {
do {
@@ -741,7 +741,7 @@ static void GfxBlitTileZoomIn(BlitterParams *bp)
bp->dst += bp->pitch;
} while (--bp->height != 0);
} else if (bp->mode & 2) {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
do {
do {
done = src_o[0];
@@ -775,7 +775,7 @@ static void GfxBlitTileZoomIn(BlitterParams *bp)
bp->dst += bp->pitch;
} while (--bp->height != 0);
} else {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
do {
do {
done = src_o[0];
@@ -900,7 +900,7 @@ static void GfxBlitTileZoomMedium(BlitterParams *bp)
const byte* ctab;
if (bp->mode & 1) {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
do {
do {
done = src_o[0];
@@ -949,7 +949,7 @@ static void GfxBlitTileZoomMedium(BlitterParams *bp)
} while (!(done & 0x80));
} while (--bp->height != 0);
} else if (bp->mode & 2) {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
do {
do {
done = src_o[0];
@@ -994,7 +994,7 @@ static void GfxBlitTileZoomMedium(BlitterParams *bp)
} while (!(done & 0x80));
} while (--bp->height != 0);
} else {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
do {
do {
done = src_o[0];
@@ -1105,7 +1105,7 @@ static void GfxBlitTileZoomOut(BlitterParams *bp)
const byte* ctab;
if (bp->mode & 1) {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
for(;;) {
do {
done = src_o[0];
@@ -1174,7 +1174,7 @@ static void GfxBlitTileZoomOut(BlitterParams *bp)
if (--bp->height == 0) return;
}
} else if (bp->mode & 2) {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
for(;;) {
do {
done = src_o[0];
@@ -1239,7 +1239,7 @@ static void GfxBlitTileZoomOut(BlitterParams *bp)
if (--bp->height == 0) return;
}
} else {
src_o += READ_LE_UINT16(src_o + bp->start_y * 2);
src_o += ReadLE16Aligned(src_o + bp->start_y * 2);
for(;;) {
do {
done = src_o[0];