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]);
}
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);
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
reader_resetbits(&reader);
flags1 = reader_readu8(&reader);
flags2 = reader_readu8(&reader);
- if(flags1 & 128)
+ if(flags1 & 1)
callback(reader_getinputpos(&reader));
}
break;