diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-29 11:18:10 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-01-29 11:20:34 (GMT) |
| commit | 5d34cae2e48938aaeebb44786e164bc3c7d94a43 (patch) | |
| tree | c68a0c1fb12af59e4e9f2ee92c0aa088359b5f28 /src | |
| parent | 9938378c0d7eed11dc3cf2db67dfd32d0c31dfd7 (diff) | |
| download | powder-5d34cae2e48938aaeebb44786e164bc3c7d94a43.zip powder-5d34cae2e48938aaeebb44786e164bc3c7d94a43.tar.gz | |
Consistent use of NGOL, better NSCN description
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.c | 2 | ||||
| -rw-r--r-- | src/powder.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -718,7 +718,7 @@ int parse_save(void *save, int size, int replace, int x0, int y0) ttv |= (d[p++]); parts[i-1].tmp = ttv; if(ptypes[parts[i-1].type].properties&PROP_LIFE && !parts[i-1].tmp) - for(q = 1; q<NGOL ; q++) { + for(q = 1; q<=NGOL ; q++) { if(parts[i-1].type==goltype[q-1] && grule[q][9]==2) parts[i-1].tmp = grule[q][9]-1; } diff --git a/src/powder.c b/src/powder.c index b2932d1..a378da4 100644 --- a/src/powder.c +++ b/src/powder.c @@ -1328,7 +1328,7 @@ void update_particles_i(pixel *vid, int start, int inc) neighbors = gol2[nx][ny][0]; if(neighbors==0 || !(ptypes[r&0xFF].properties&PROP_LIFE || !r&0xFF) || (r>>8)>=NPART) continue; - for ( golnum = 1; golnum<NGOL; golnum++) + for ( golnum = 1; golnum<=NGOL; golnum++) for ( goldelete = 0; goldelete<9; goldelete++) { if (neighbors==goldelete&&gol[nx][ny]==0&&grule[golnum][goldelete]>=2&&gol2[nx][ny][golnum]>=(goldelete%2)+goldelete/2) @@ -1345,7 +1345,7 @@ void update_particles_i(pixel *vid, int start, int inc) parts[r>>8].type = PT_NONE;//using kill_part makes it not work } gol2[nx][ny][0] = 0; - for ( z = 1; z<NGOL; z++) + for ( z = 1; z<=NGOL; z++) gol2[nx][ny][z] = 0; } if (createdsomething) |