diff options
| author | Simon <simon@hardwired.org.uk> | 2010-12-29 21:15:40 (GMT) |
|---|---|---|
| committer | Simon <simon@hardwired.org.uk> | 2010-12-29 21:15:40 (GMT) |
| commit | 3715925dd95c7433c4bfd3078089bcf05a16f813 (patch) | |
| tree | 6e7c1ac2757738343f748fd51d4ab3ad5dcca3a9 /src/powder.c | |
| parent | 713034ed619378aa0abc6b38b69604e1aba8821c (diff) | |
| parent | 5766f9aa7ee0f78adea5799322dce67506d9247d (diff) | |
| download | powder-3715925dd95c7433c4bfd3078089bcf05a16f813.zip powder-3715925dd95c7433c4bfd3078089bcf05a16f813.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 8b76216..ccea3ed 100644 --- a/src/powder.c +++ b/src/powder.c @@ -986,6 +986,7 @@ inline int parts_avg(int ci, int ni,int t) else return PT_NONE; } + return PT_NONE; } @@ -3165,7 +3166,7 @@ void update_particles_i(pixel *vid, int start, int inc) if((r>>8)>=NPART || !r) continue; if(parts[r>>8].type==PT_SPRK || (parts[r>>8].type!=PT_PRTI && parts[r>>8].type!=PT_PRTO && (ptypes[parts[r>>8].type].falldown!= 0 || pstates[parts[r>>8].type].state == ST_GAS))) - for( nnx=0;nnx<8;nnx++) + for( nnx=0;nnx<80;nnx++) if(!portal[parts[i].tmp][count-1][nnx]) { portal[parts[i].tmp][count-1][nnx] = parts[r>>8].type; @@ -3196,7 +3197,7 @@ void update_particles_i(pixel *vid, int start, int inc) continue; if(!r) { - for( nnx =0 ;nnx<8;nnx++) + for( nnx =0 ;nnx<80;nnx++) { int randomness = count + rand()%3-1; if(randomness<1) |