thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRIM: SYSTEM_*_ENDIAN -> SCUMM_*_ENDIAN

Browse source
This commit is contained in:
Pawel Kolodziejski 2011-05-01 21:05:45 +02:00
parent bb529e9647
commit 21fae5e42b
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/grim/bitmap.cpp
View file

@ -77,7 +77,7 @@ Bitmap::Bitmap(const char *fname, const char *data, int len) :
pos += compressed_len + 12; pos += compressed_len + 12;
} }
#ifdef SYSTEM_BIG_ENDIAN #ifdef SCUMM_BIG_ENDIAN
if (_format == 1) if (_format == 1)
for (int j = 0; j < _width * _height; ++j) { for (int j = 0; j < _width * _height; ++j) {
((uint16 *)_data[i])[j] = SWAP_BYTES_16(((uint16 *)_data[i])[j]); ((uint16 *)_data[i])[j] = SWAP_BYTES_16(((uint16 *)_data[i])[j]);

12
engines/grim/smush/blocky16.cpp
View file

@ -31,7 +31,7 @@
namespace Grim { namespace Grim {
#if defined(SYSTEM_NEED_ALIGNMENT) #if defined(SCUMM_NEED_ALIGNMENT)
#define COPY_4X1_LINE(dst, src) \ #define COPY_4X1_LINE(dst, src) \
do { \ do { \
@ -41,7 +41,7 @@ namespace Grim {
(dst)[3] = (src)[3]; \ (dst)[3] = (src)[3]; \
} while (0) } while (0)
#if defined(SYSTEM_BIG_ENDIAN) #if defined(SCUMM_BIG_ENDIAN)
#define WRITE_2X1_LINE(dst, v) \ #define WRITE_2X1_LINE(dst, v) \
do { \ do { \
@ -57,7 +57,7 @@ namespace Grim {
(dst)[3] = (byte)((v >> 0) & 0xFF); \ (dst)[3] = (byte)((v >> 0) & 0xFF); \
} while (0) } while (0)
#else /* SYSTEM_BIG_ENDIAN */ #else /* SCUMM_BIG_ENDIAN */
#define WRITE_2X1_LINE(dst, v) \ #define WRITE_2X1_LINE(dst, v) \
do { \ do { \
@ -75,7 +75,7 @@ namespace Grim {
#endif #endif
#else /* SYSTEM_NEED_ALIGNMENT */ #else /* SCUMM_NEED_ALIGNMENT */
#define COPY_4X1_LINE(dst, src) \ #define COPY_4X1_LINE(dst, src) \
*(uint32 *)(dst) = *(const uint32 *)(src); *(uint32 *)(dst) = *(const uint32 *)(src);
@ -719,7 +719,7 @@ static void bompDecodeMain(byte *dst, const byte *src, int size) {
size /= 2; size /= 2;
bompInit(src); bompInit(src);
while (size--) { while (size--) {
#ifdef SYSTEM_BIG_ENDIAN #ifdef SCUMM_BIG_ENDIAN
*(dst + 1) = bompDecode(); *(dst + 1) = bompDecode();
*(dst + 0) = bompDecode(); *(dst + 0) = bompDecode();
#else #else
@ -759,7 +759,7 @@ void Blocky16::decode(byte *dst, const byte *src) {
switch(src[18]) { switch(src[18]) {
case 0: case 0:
#if defined(SYSTEM_BIG_ENDIAN) #if defined(SCUMM_BIG_ENDIAN)
for (int i = 0; i < _width * _height; i++) { for (int i = 0; i < _width * _height; i++) {
((uint16 *)_curBuf)[i] = READ_LE_UINT16(gfx_data + i * 2); ((uint16 *)_curBuf)[i] = READ_LE_UINT16(gfx_data + i * 2);
} }

2
graphics/tinygl/image_util.cpp
View file

@ -14,7 +14,7 @@ void gl_convertRGB_to_5R6G5B8A(unsigned short *pixmap, unsigned char *rgba, int
p2 = (unsigned char *)pixmap; p2 = (unsigned char *)pixmap;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
unsigned short pixel = ((p[0] & 0xF8) << 8) | ((p[1] & 0xFC) << 3) | ((p[2] & 0xF8) >> 3); unsigned short pixel = ((p[0] & 0xF8) << 8) | ((p[1] & 0xFC) << 3) | ((p[2] & 0xF8) >> 3);
#ifdef SYSTEM_BIG_ENDIAN #ifdef SCUMM_BIG_ENDIAN
p2[3 * i + 0] = pixel >> 8; p2[3 * i + 0] = pixel >> 8;
p2[3 * i + 1] = pixel & 0xff; p2[3 * i + 1] = pixel & 0xff;
#else #else