aboutsummaryrefslogtreecommitdiff
path: root/sword2/resman.cpp
diff options
context:
space:
mode:
authorMax Horn2003-09-13 21:20:05 +0000
committerMax Horn2003-09-13 21:20:05 +0000
commit30e478589676c64ce37135d1f558c49c4bb48e25 (patch)
tree97a95e5138e2aa06bc26d6f60ee81725b063dd58 /sword2/resman.cpp
parent199e9632b8f4b0d90fc21640e288e1cb56db8948 (diff)
downloadscummvm-rg350-30e478589676c64ce37135d1f558c49c4bb48e25.tar.gz
scummvm-rg350-30e478589676c64ce37135d1f558c49c4bb48e25.tar.bz2
scummvm-rg350-30e478589676c64ce37135d1f558c49c4bb48e25.zip
simplified code
svn-id: r10245
Diffstat (limited to 'sword2/resman.cpp')
-rw-r--r--sword2/resman.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/sword2/resman.cpp b/sword2/resman.cpp
index a409e0f772..01d764435d 100644
--- a/sword2/resman.cpp
+++ b/sword2/resman.cpp
@@ -258,9 +258,7 @@ void resMan::Close_ResMan(void) { //Tony29May96
#ifdef SCUMM_BIG_ENDIAN
// Quick macro to make swapping in-place easier to write
-#define SWAP16_S(x) x = (int16)SWAP_BYTES_16(x)
#define SWAP16(x) x = SWAP_BYTES_16(x)
-#define SWAP32_S(x) x = (int16)SWAP_BYTES_32(x)
#define SWAP32(x) x = SWAP_BYTES_32(x)
static void convertEndian(uint8 *file, uint32 len) {
int i;
@@ -284,8 +282,8 @@ static void convertEndian(uint8 *file, uint32 len) {
_cdtEntry *cdtEntry = (_cdtEntry *) (file + sizeof(_animHeader));
for (i = 0; i < animHead->noAnimFrames; i++, cdtEntry++) {
- SWAP16_S(cdtEntry->x);
- SWAP16_S(cdtEntry->y);
+ SWAP16(cdtEntry->x);
+ SWAP16(cdtEntry->y);
SWAP32(cdtEntry->frameOffset);
_frameHeader *frameHeader = (_frameHeader *) (file + cdtEntry->frameOffset);