git.asbjorn.biz
/
swftools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generated from configure.in
[swftools.git]
/
src
/
reloc.c
diff --git
a/src/reloc.c
b/src/reloc.c
index
6217d34
..
00983b6
100644
(file)
--- 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"
This file is distributed under the GPL, see file COPYING for details */
#include "flash.h"
+#include "../lib/rfxswf.h"
static struct swffile file;
static struct swffile file;
@@
-17,12
+18,13
@@
int slaveids[65536];
void maponeid(void*idpos)
{
u16*idptr = (u16*)idpos;
void maponeid(void*idpos)
{
u16*idptr = (u16*)idpos;
- if(slaveids[*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 ;
}
return ;
}
- logf("<debug> mapping %d to %d", *idptr, slaveids[*idptr]);
- *idptr = 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());
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);
(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;
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
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);
reader_resetbits(&reader);
flags1 = reader_readu8(&reader);
flags2 = reader_readu8(&reader);
- if(flags1 & 128)
+ if(flags1 & 1)
callback(reader_getinputpos(&reader));
}
break;
callback(reader_getinputpos(&reader));
}
break;