From 30e478589676c64ce37135d1f558c49c4bb48e25 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 13 Sep 2003 21:20:05 +0000 Subject: simplified code svn-id: r10245 --- sword2/resman.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sword2/resman.cpp') 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); -- cgit v1.2.3