diff options
| author | Joost Peters | 2009-02-21 12:21:15 +0000 |
|---|---|---|
| committer | Joost Peters | 2009-02-21 12:21:15 +0000 |
| commit | 3988062776a0b1c3775807b8f733382c4c1d838f (patch) | |
| tree | 7fcfd90c6e61fa682fbb8a588e0a471e85e46f7f /engines/sci/scicore | |
| parent | f069c04c60abf8616b258c9550f31b6b58ece787 (diff) | |
| download | scummvm-rg350-3988062776a0b1c3775807b8f733382c4c1d838f.tar.gz scummvm-rg350-3988062776a0b1c3775807b8f733382c4c1d838f.tar.bz2 scummvm-rg350-3988062776a0b1c3775807b8f733382c4c1d838f.zip | |
replace #ifdef WORDS_BIGENDIAN by SCUMM_BIG_ENDIAN
svn-id: r38689
Diffstat (limited to 'engines/sci/scicore')
| -rw-r--r-- | engines/sci/scicore/decompress0.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/scicore/decompress01.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/scicore/decompress1.cpp | 6 | ||||
| -rw-r--r-- | engines/sci/scicore/decompress11.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/sci/scicore/decompress0.cpp b/engines/sci/scicore/decompress0.cpp index 4768e033de..0f6411b6a7 100644 --- a/engines/sci/scicore/decompress0.cpp +++ b/engines/sci/scicore/decompress0.cpp @@ -231,7 +231,7 @@ int sci0_get_compression_method(Common::ReadStream &stream) { if ((stream.read(&compressedLength, 2) != 2) || (stream.read(&result_size, 2) != 2) || (stream.read(&compressionMethod, 2) != 2)) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN compressionMethod = GUINT16_SWAP_LE_BE_CONSTANT(compressionMethod); #endif @@ -247,7 +247,7 @@ int decompress0(resource_t *result, Common::ReadStream &stream, int sci_version) if (stream.read(&(result->id), 2) != 2) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN result->id = GUINT16_SWAP_LE_BE_CONSTANT(result->id); #endif result->number = result->id & 0x07ff; @@ -259,7 +259,7 @@ int decompress0(resource_t *result, Common::ReadStream &stream, int sci_version) if ((stream.read(&compressedLength, 2) != 2) || (stream.read(&result_size, 2) != 2) || (stream.read(&compressionMethod, 2) != 2)) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN compressedLength = GUINT16_SWAP_LE_BE_CONSTANT(compressedLength); result_size = GUINT16_SWAP_LE_BE_CONSTANT(result_size); compressionMethod = GUINT16_SWAP_LE_BE_CONSTANT(compressionMethod); diff --git a/engines/sci/scicore/decompress01.cpp b/engines/sci/scicore/decompress01.cpp index 6c22437d46..59afdb6b56 100644 --- a/engines/sci/scicore/decompress01.cpp +++ b/engines/sci/scicore/decompress01.cpp @@ -496,7 +496,7 @@ int decompress01(resource_t *result, Common::ReadStream &stream, int sci_version if (stream.read(&(result->id), 2) != 2) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN result->id = GUINT16_SWAP_LE_BE_CONSTANT(result->id); #endif @@ -509,7 +509,7 @@ int decompress01(resource_t *result, Common::ReadStream &stream, int sci_version if ((stream.read(&compressedLength, 2) != 2) || (stream.read(&result_size, 2) != 2) || (stream.read(&compressionMethod, 2) != 2)) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN compressedLength = GUINT16_SWAP_LE_BE_CONSTANT(compressedLength); result_size = GUINT16_SWAP_LE_BE_CONSTANT(result_size); compressionMethod = GUINT16_SWAP_LE_BE_CONSTANT(compressionMethod); diff --git a/engines/sci/scicore/decompress1.cpp b/engines/sci/scicore/decompress1.cpp index 7d56545070..6a49ceb740 100644 --- a/engines/sci/scicore/decompress1.cpp +++ b/engines/sci/scicore/decompress1.cpp @@ -273,7 +273,7 @@ int decompress1(resource_t *result, Common::ReadStream &stream, int sci_version) if (stream.read(&(result->id), 2) != 2) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN result->id = GUINT16_SWAP_LE_BE_CONSTANT(result->id); #endif @@ -292,7 +292,7 @@ int decompress1(resource_t *result, Common::ReadStream &stream, int sci_version) if (stream.read(&(result->number), 2) != 2) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN result->number = GUINT16_SWAP_LE_BE_CONSTANT(result->number); #endif if ((result->number >= sci_max_resource_nr[SCI_VERSION_1_LATE]) || (result->type > sci_invalid_resource)) @@ -302,7 +302,7 @@ int decompress1(resource_t *result, Common::ReadStream &stream, int sci_version) if ((stream.read(&compressedLength, 2) != 2) || (stream.read(&result_size, 2) != 2) || (stream.read(&compressionMethod, 2) != 2)) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN compressedLength = GUINT16_SWAP_LE_BE_CONSTANT(compressedLength); result_size = GUINT16_SWAP_LE_BE_CONSTANT(result_size); compressionMethod = GUINT16_SWAP_LE_BE_CONSTANT(compressionMethod); diff --git a/engines/sci/scicore/decompress11.cpp b/engines/sci/scicore/decompress11.cpp index 49a355d8bd..722f51dd6f 100644 --- a/engines/sci/scicore/decompress11.cpp +++ b/engines/sci/scicore/decompress11.cpp @@ -54,7 +54,7 @@ int decompress11(resource_t *result, Common::ReadStream &stream, int sci_version if (stream.read(&(result->number), 2) != 2) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN result->number = GUINT16_SWAP_LE_BE_CONSTANT(result->number); #endif if ((result->type > sci_invalid_resource)) @@ -63,7 +63,7 @@ int decompress11(resource_t *result, Common::ReadStream &stream, int sci_version if ((stream.read(&compressedLength, 2) != 2) || (stream.read(&result_size, 2) != 2) || (stream.read(&compressionMethod, 2) != 2)) return SCI_ERROR_IO_ERROR; -#ifdef WORDS_BIGENDIAN +#ifdef SCUMM_BIG_ENDIAN compressedLength = GUINT16_SWAP_LE_BE_CONSTANT(compressedLength); result_size = GUINT16_SWAP_LE_BE_CONSTANT(result_size); compressionMethod = GUINT16_SWAP_LE_BE_CONSTANT(compressionMethod); |