[Scummvm-cvs-logs] SF.net SVN: scummvm:[38689] scummvm/trunk/engines/sci
joostp at users.sourceforge.net
joostp at users.sourceforge.net
Sat Feb 21 13:21:15 CET 2009
Revision: 38689
http://scummvm.svn.sourceforge.net/scummvm/?rev=38689&view=rev
Author: joostp
Date: 2009-02-21 12:21:15 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
replace #ifdef WORDS_BIGENDIAN by SCUMM_BIG_ENDIAN
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/kstring.cpp
scummvm/trunk/engines/sci/gfx/antialias.cpp
scummvm/trunk/engines/sci/gfx/gfx_line.cpp
scummvm/trunk/engines/sci/gfx/gfx_resource.cpp
scummvm/trunk/engines/sci/gfx/gfx_support.cpp
scummvm/trunk/engines/sci/include/sfx_pcm.h
scummvm/trunk/engines/sci/scicore/decompress0.cpp
scummvm/trunk/engines/sci/scicore/decompress01.cpp
scummvm/trunk/engines/sci/scicore/decompress1.cpp
scummvm/trunk/engines/sci/scicore/decompress11.cpp
Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -426,7 +426,7 @@
((strlen((const char*)dest) < 2) || (!is_print_str((char*)dest))))
/* SQ4 array handling detected */
{
-#ifndef WORDS_BIGENDIAN
+#ifndef SCUMM_BIG_ENDIAN
int odd = KP_UINT(argv[1]) & 1;
#else
int odd = !(KP_UINT(argv[1]) & 1);
Modified: scummvm/trunk/engines/sci/gfx/antialias.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/antialias.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/gfx/antialias.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -135,7 +135,7 @@
int masks[3];
int shift_const = 0;
-#ifdef WORDS_BIGENDIAN
+#ifdef SCUMM_BIG_ENDIAN
shift_const = (sizeof(unsigned long) - mode->bytespp) << 3;
#endif
Modified: scummvm/trunk/engines/sci/gfx/gfx_line.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_line.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/gfx/gfx_line.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -52,7 +52,7 @@
dy = end.y - start.y;
finalx = end.x;
finaly = end.y;
-#ifdef WORDS_BIGENDIAN
+#ifdef SCUMM_BIG_ENDIAN
color = GUINT32_SWAP_LE_BE_CONSTANT(color);
#endif
dx = abs(dx);
Modified: scummvm/trunk/engines/sci/gfx/gfx_resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_resource.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/gfx/gfx_resource.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -222,10 +222,10 @@
#include "gfx_pixmap_scale.cpp"
#undef COPY_BYTES
-#ifdef WORDS_BIGENDIAN
+#ifdef SCUMM_BIG_ENDIAN
# undef EXTRA_BYTE_OFFSET
# define EXTRA_BYTE_OFFSET 1
-#endif // WORDS_BIGENDIAN
+#endif // SCUMM_BIG_ENDIAN
#define SIZETYPE guint32
#define FUNCNAME _gfx_xlate_pixmap_unfiltered_3
#define FUNCNAME_LINEAR _gfx_xlate_pixmap_linear_3
@@ -233,10 +233,10 @@
#define COPY_BYTES 3
#include "gfx_pixmap_scale.cpp"
#undef COPY_BYTES
-#ifdef WORDS_BIGENDIAN
+#ifdef SCUMM_BIG_ENDIAN
# undef EXTRA_BYTE_OFFSET
# define EXTRA_BYTE_OFFSET 0
-#endif // WORDS_BIGENDIAN
+#endif // SCUMM_BIG_ENDIAN
#define SIZETYPE guint32
#define FUNCNAME _gfx_xlate_pixmap_unfiltered_4
Modified: scummvm/trunk/engines/sci/gfx/gfx_support.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/gfx_support.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/gfx/gfx_support.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -362,7 +362,7 @@
alpha_mask &= 0xff;
}
-#ifdef WORDS_BIGENDIAN
+#ifdef SCUMM_BIG_ENDIAN
alpha += (mode->bytespp) - (shift_nr + 1);
#else
alpha += shift_nr;
Modified: scummvm/trunk/engines/sci/include/sfx_pcm.h
===================================================================
--- scummvm/trunk/engines/sci/include/sfx_pcm.h 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/include/sfx_pcm.h 2009-02-21 12:21:15 UTC (rev 38689)
@@ -54,7 +54,7 @@
#define SFX_PCM_FORMAT_U16_BE (0x8000 | SFX_PCM_FORMAT_16 | SFX_PCM_FORMAT_BE) /* Unsigned (bias 32768) 16 bit BE format */
#define SFX_PCM_FORMAT_S16_BE (0x0000 | SFX_PCM_FORMAT_16 | SFX_PCM_FORMAT_BE) /* Signed 16 bit format, big endian */
-#ifdef WORDS_BIGENDIAN
+#ifdef SCUMM_BIG_ENDIAN
# define SFX_PCM_FORMAT_U16_NATIVE SFX_PCM_FORMAT_U16_BE
# define SFX_PCM_FORMAT_S16_NATIVE SFX_PCM_FORMAT_S16_BE
#else
Modified: scummvm/trunk/engines/sci/scicore/decompress0.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress0.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/scicore/decompress0.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -231,7 +231,7 @@
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 @@
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 @@
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);
Modified: scummvm/trunk/engines/sci/scicore/decompress01.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress01.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/scicore/decompress01.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -496,7 +496,7 @@
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 @@
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);
Modified: scummvm/trunk/engines/sci/scicore/decompress1.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress1.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/scicore/decompress1.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -273,7 +273,7 @@
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 @@
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 @@
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);
Modified: scummvm/trunk/engines/sci/scicore/decompress11.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress11.cpp 2009-02-21 12:16:35 UTC (rev 38688)
+++ scummvm/trunk/engines/sci/scicore/decompress11.cpp 2009-02-21 12:21:15 UTC (rev 38689)
@@ -54,7 +54,7 @@
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 @@
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list