diff options
| author | Simon <simon@hardwired.org.uk> | 2010-12-07 21:40:17 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2010-12-07 21:40:17 (GMT) |
| commit | ac8701eb304c452f49bb806c2db08b0118d5d21c (patch) | |
| tree | 987e59009c83b39b3d500c25c412d854d4fcd187 /src/main.c | |
| parent | 2bd851e14835cc48e71f8c291e6ca2fdccfd7319 (diff) | |
| download | powder-ac8701eb304c452f49bb806c2db08b0118d5d21c.zip powder-ac8701eb304c452f49bb806c2db08b0118d5d21c.tar.gz | |
Fix fan loading and remove delete button on favourite view
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -249,7 +249,7 @@ void *build_save(int *size, int x0, int y0, int w, int h) d[p++] = bmap[y][x]; for(y=by0; y<by0+bh; y++) for(x=bx0; x<bx0+bw; x++) - if(bmap[y][x]==WL_FAN) + if(bmap[y][x]==WL_FAN||bmap[y][x]==4) { i = (int)(fvx[y][x]*64.0f+127.5f); if(i<0) i=0; @@ -258,7 +258,7 @@ void *build_save(int *size, int x0, int y0, int w, int h) } for(y=by0; y<by0+bh; y++) for(x=bx0; x<bx0+bw; x++) - if(bmap[y][x]==WL_FAN) + if(bmap[y][x]==WL_FAN||bmap[y][x]==4) { i = (int)(fvy[y][x]*64.0f+127.5f); if(i<0) i=0; @@ -536,7 +536,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0) } for(y=by0; y<by0+bh; y++) for(x=bx0; x<bx0+bw; x++) - if(d[(y-by0)*bw+(x-bx0)]==4) + if(d[(y-by0)*bw+(x-bx0)]==4||d[(y-by0)*bw+(x-bx0)]==WL_FAN) { if(p >= size) goto corrupt; @@ -544,7 +544,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0) } for(y=by0; y<by0+bh; y++) for(x=bx0; x<bx0+bw; x++) - if(d[(y-by0)*bw+(x-bx0)]==4) + if(d[(y-by0)*bw+(x-bx0)]==4||d[(y-by0)*bw+(x-bx0)]==WL_FAN) { if(p >= size) goto corrupt; |