@@ -698,7 +698,7 @@ static void GfxBlitTileZoomIn(BlitterPar
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 {
@@ -741,7 +741,7 @@ static void GfxBlitTileZoomIn(BlitterPar
bp->dst += bp->pitch;
} while (--bp->height != 0);
} else if (bp->mode & 2) {
done = src_o[0];
@@ -775,7 +775,7 @@ static void GfxBlitTileZoomIn(BlitterPar
} else {
@@ -900,7 +900,7 @@ static void GfxBlitTileZoomMedium(Blitte
@@ -949,7 +949,7 @@ static void GfxBlitTileZoomMedium(Blitte
} while (!(done & 0x80));
@@ -994,7 +994,7 @@ static void GfxBlitTileZoomMedium(Blitte
@@ -1105,7 +1105,7 @@ static void GfxBlitTileZoomOut(BlitterPa
for (;;) {
@@ -1174,7 +1174,7 @@ static void GfxBlitTileZoomOut(BlitterPa
if (--bp->height == 0) return;
}
@@ -1239,7 +1239,7 @@ static void GfxBlitTileZoomOut(BlitterPa
@@ -142,14 +142,20 @@ static inline void swap_int32(int32 *a,
static inline void swap_tile(TileIndex *a, TileIndex *b) { TileIndex t = *a; *a = *b; *b = t; }
static inline uint16 ReadLE16Aligned(const void* x)
{
return FROM_LE16(*(const uint16*)x);
#if defined(TTD_LITTLE_ENDIAN)
# define READ_LE_UINT16(b) (*(const uint16*)(b))
#elif defined(TTD_BIG_ENDIAN)
static inline uint16 READ_LE_UINT16(const void *b) {
return ((const byte*)b)[0] + (((const byte*)b)[1] << 8);
static inline uint16 ReadLE16Unaligned(const void* x)
#ifdef OTTD_ALIGNMENT
return ((const byte*)x)[0] | ((const byte*)x)[1] << 8;
#else
#endif
/**
* ROtate x Left/Right by n (must be >= 0)
@@ -194,7 +194,7 @@ static const uint16 * const _legend_tabl
_legend_industries_candy,
};
#if defined(TTD_ALIGNMENT_4)
#if defined(OTTD_ALIGNMENT)
static inline void WRITE_PIXELS(Pixel* d, uint32 val)
# if defined(TTD_BIG_ENDIAN)
@@ -82,8 +82,6 @@
# define CDECL
# define NOT_REACHED() assert(0)
# define GCC_PACK
# undef TTD_ALIGNMENT_4
# undef TTD_ALIGNMENT_2
# include <malloc.h>
#endif /* __WATCOMC__ */
@@ -133,8 +131,6 @@
# endif
# endif /* _MSC_VER < 1300 */
// This is needed to zlib uses the stdcall calling convention on visual studio, also used with libpng (VS6 warning)
@@ -193,10 +189,13 @@ typedef unsigned char byte;
typedef unsigned __int64 uint64;
#endif /* __BEOS__ */
#if defined(ARM) || defined(__arm__)
# define OTTD_ALIGNMENT
// Setup alignment and conversion macros
#if defined(TTD_BIG_ENDIAN)
# define TTD_ALIGNMENT_2
# define TTD_ALIGNMENT_4
static inline uint32 TO_LE32(uint32 x) { return BSWAP32(x); }
static inline uint16 TO_LE16(uint16 x) { return BSWAP16(x); }
static inline uint32 FROM_LE32(uint32 x) { return BSWAP32(x); }
@@ -500,7 +500,7 @@ static char *FormatString(char *buff, co
break;
case 0x81: // {STRINL}
buff = GetStringWithArgs(buff, READ_LE_UINT16(str), argv);
buff = GetStringWithArgs(buff, ReadLE16Unaligned(str), argv);
str += 2;
case 0x82: // {DATE_LONG}
@@ -1015,7 +1015,7 @@ bool ReadLanguagePack(int lang_index)
for (i = 0; i != 32; i++) {
lang_pack->offsets[i] = READ_LE_UINT16(&lang_pack->offsets[i]);
lang_pack->offsets[i] = ReadLE16Aligned(&lang_pack->offsets[i]);
Status change: