diff options
| author | Simon <simon@hardwired.org.uk> | 2011-01-01 12:43:44 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2011-01-01 12:43:44 (GMT) |
| commit | c3eb6e11f9c6561da25ac37e33d95bdf042f2353 (patch) | |
| tree | 31f5bade39bcf8bf3307839df9b0a0afa11ba893 /src/powder.c | |
| parent | 6340ff2ac90afb74be62b1999befc8c2455d4c33 (diff) | |
| parent | 5b86cd5c217efa50df96a2ad36ee137646387655 (diff) | |
| download | powder-c3eb6e11f9c6561da25ac37e33d95bdf042f2353.zip powder-c3eb6e11f9c6561da25ac37e33d95bdf042f2353.tar.gz | |
Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy
Diffstat (limited to 'src/powder.c')
| -rw-r--r-- | src/powder.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/powder.c b/src/powder.c index ea45839..f61d6d5 100644 --- a/src/powder.c +++ b/src/powder.c @@ -4882,7 +4882,7 @@ killed: } } } - else if(parts[i].ctype>77&&parts[i].ctype<77+NGOL) { + else if(ptypes[parts[i].ctype].properties&PROP_LIFE) { for(nx=-1; nx<2; nx++) { for(ny=-1; ny<2; ny++) { create_part(-1, x+nx, y+ny, parts[i].ctype); @@ -6071,7 +6071,8 @@ int create_parts(int x, int y, int rx, int ry, int c) } if(rx==0&&ry==0)//workaround for 1pixel brush/floodfill crashing. todo: find a better fix later. { - create_part(-2, x, y, c); + if(create_part(-2, x, y, c)==-1) + f = 1; } else for(j=-ry; j<=ry; j++) |