X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Freloc.c;h=00983b6ca1bb4e81b6e5d289995404ceb1a86e02;hb=0422bd4ca0113cbd99a44674ad14e7da08f3d1f1;hp=c716b9051dce3d5875d948f4c6b2be0870278f20;hpb=caacc3b7bc77a04e35891f73908f9c0a7c8c64fa;p=swftools.git

diff --git a/src/reloc.c b/src/reloc.c
index c716b90..00983b6 100644
--- a/src/reloc.c
+++ b/src/reloc.c
@@ -9,6 +9,7 @@
    This file is distributed under the GPL, see file COPYING for details */
 
 #include "flash.h"
+#include "../lib/rfxswf.h"
 
 static struct swffile file;
 
@@ -17,12 +18,13 @@ int slaveids[65536];
 void maponeid(void*idpos)
 {
     u16*idptr = (u16*)idpos;
-    if(slaveids[SWAP16(*idptr)]<0) {
-	logf("<error> Trying to map id never encountered before: id=%d", *idptr);
+    U16 id = GET16(idptr);
+    if(slaveids[id]<0) {
+	logf("<error> Trying to map id never encountered before: id=%d", id);
 	return ;
     }
-    logf("<debug> mapping %d to %d", SWAP16(*idptr), slaveids[*idptr]);
-    *idptr =  SWAP16(slaveids[*idptr]);
+    logf("<debug> mapping %d to %d", id, slaveids[id]);
+    PUT16(idptr, slaveids[id]);
 }
 
 
@@ -66,7 +68,7 @@ void mapstyles(struct reader_t*reader, int num, void(*callback)(void*))
 	    reader_resetbits(reader);
 	    // we made it.
 //	    printf("bitmap fill:%04x\n", *(u16*)getinputpos());
-	    if(*(u16*)reader_getinputpos(reader) != 65535)
+	    if(GET16(reader_getinputpos(reader)) != 65535)
 		(callback)(reader_getinputpos(reader));
 
 	    reader_readu16(reader);
@@ -193,7 +195,7 @@ void map_ids_mem(u8*mem, int length, void(*callback)(void*))
 		u16 charid;
 		if(!reader_readu8(&reader)) //flags
 		    break; 
-		charid = *(u16*)reader_getinputpos(&reader);
+		charid = GET16(reader_getinputpos(&reader));
 		callback(reader_getinputpos(&reader));
 		reader_readu16(&reader); //char
 		reader_readu16(&reader); //layer
@@ -216,7 +218,7 @@ void map_ids_mem(u8*mem, int length, void(*callback)(void*))
 	    reader_resetbits(&reader);
 	    flags1 = reader_readu8(&reader);
 	    flags2 = reader_readu8(&reader);
-	    if(flags1 & 128)
+	    if(flags1 & 1)
 		callback(reader_getinputpos(&reader));
 	}
 	break;