matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missing and incorrect bitshifts preventing the correct reading of life, tmp and dcolour

Browse Source
This commit is contained in:
Simon Robertshaw 2012-01-02 14:04:42 +00:00
parent 4741e7682a
commit 8b88557047
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/save.c
View File

@ -1028,7 +1028,7 @@ int parse_save_OPS(void *save, int size, int replace, int x0, int y0, unsigned c
if(fieldDescriptor & 0x04) if(fieldDescriptor & 0x04)
{ {
if(i >= partsDataLen) goto fail; if(i >= partsDataLen) goto fail;
partsptr[newIndex].life |= partsData[i++]; partsptr[newIndex].life |= (((unsigned)partsData[i++]) << 8);
} }
} }
@ -1041,7 +1041,7 @@ int parse_save_OPS(void *save, int size, int replace, int x0, int y0, unsigned c
if(fieldDescriptor & 0x10) if(fieldDescriptor & 0x10)
{ {
if(i >= partsDataLen) goto fail; if(i >= partsDataLen) goto fail;
partsptr[newIndex].tmp |= partsData[i++]; partsptr[newIndex].tmp |= (((unsigned)partsData[i++]) << 8);
} }
} }
@ -1056,10 +1056,10 @@ int parse_save_OPS(void *save, int size, int replace, int x0, int y0, unsigned c
if(fieldDescriptor & 0x40) if(fieldDescriptor & 0x40)
{ {
if(i+3 >= partsDataLen) goto fail; if(i+3 >= partsDataLen) goto fail;
partsptr[newIndex].dcolour = partsData[i++]; partsptr[newIndex].dcolour = (((unsigned)partsData[i++]) << 24);
partsptr[newIndex].dcolour |= partsData[i++]<<8; partsptr[newIndex].dcolour |= (((unsigned)partsData[i++]) << 16);
partsptr[newIndex].dcolour |= partsData[i++]<<16; partsptr[newIndex].dcolour |= (((unsigned)partsData[i++]) << 8);
partsptr[newIndex].dcolour |= partsData[i++]<<24; partsptr[newIndex].dcolour |= ((unsigned)partsData[i++]);
} }
//Read vx //Read vx