diff options
| author | Cracker64 <cracker642@gmail.com> | 2010-12-05 04:29:41 (GMT) |
|---|---|---|
| committer | Cracker64 <cracker642@gmail.com> | 2010-12-05 04:29:41 (GMT) |
| commit | 2cf25c8a6aad84b2f86060e791948a0aed307192 (patch) | |
| tree | 223a496850225a5acfd8c66c7cf47dad8aaf950c /src/main.c | |
| parent | d56684312dd9429da8be8666206ad1656d3185a9 (diff) | |
| download | powder-2cf25c8a6aad84b2f86060e791948a0aed307192.zip powder-2cf25c8a6aad84b2f86060e791948a0aed307192.tar.gz | |
FILT, a photon color filter, not really a filter right now, but it changes the color. Other small changes
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 34 |
1 files changed, 26 insertions, 8 deletions
@@ -308,8 +308,13 @@ void *build_save(int *size, int x0, int y0, int w, int h) for(j=0; j<w*h; j++) { i = m[j]; - if(i) - d[p++] = (parts[i-1].life+3)/4; + if(i){ + //Everybody loves a 16bit int + //d[p++] = (parts[i-1].life+3)/4; + int ttlife = (int)parts[i-1].life; + d[p++] = ((ttlife&0xFF00)>>8); + d[p++] = (ttlife&0x00FF); + } } for(j=0; j<w*h; j++) { @@ -623,12 +628,25 @@ int parse_save(void *save, int size, int replace, int x0, int y0) i = m[j]; if(i) { - if(p >= size) - goto corrupt; - if(i <= NPART) - parts[i-1].life = d[p++]*4; - else - p++; + if(ver>=44){ + if(p >= size) { + goto corrupt; + } + if(i <= NPART) { + ttv = (d[p++])<<8; + ttv |= (d[p++]); + parts[i-1].life = ttv; + } else { + p+=2; + } + } else { + if(p >= size) + goto corrupt; + if(i <= NPART) + parts[i-1].life = d[p++]*4; + else + p++; + } } } for(j=0; j<w*h; j++) |
