summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCracker64 <cracker642@gmail.com>2011-01-20 19:10:34 (GMT)
committer Cracker64 <cracker642@gmail.com>2011-01-20 19:10:34 (GMT)
commit60d3f0047b21c6a1b34d07f0c0ac8c3cbc708289 (patch)
tree5c566b30e9b4c28ed15d958128c4a7a1b46bd521 /src
parente7f2eb92c5fee36e702011c350e5f0fc61afefbc (diff)
downloadpowder-60d3f0047b21c6a1b34d07f0c0ac8c3cbc708289.zip
powder-60d3f0047b21c6a1b34d07f0c0ac8c3cbc708289.tar.gz
quartz shouldn't have prop_conducts, and fixed visual studio compiling
Diffstat (limited to 'src')
-rw-r--r--src/powder.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/powder.c b/src/powder.c
index b9fa17e..27b48fa 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -1112,7 +1112,7 @@ int nearest_part(int ci, int t)
void update_particles_i(pixel *vid, int start, int inc)
{
- int i, j, x, y, t, nx, ny, r, a, s, lt, rt, fe, nt, lpv, nearp, pavg, nnx, nny, q, golnum, goldelete, z, ctype, temp, trade, docontinue, nxx, nyy, nxi, nyi;
+ int i, j, x, y, t, nx, ny, r, a, s, lt, rt, fe, nt, lpv, nearp, pavg, nnx, nny, q, golnum, goldelete, z, ctype, temp, trade, docontinue, nxx, nyy, nxi, nyi, neighbors;
float mv, dx, dy, ix, iy, lx, ly, d, pp, nrx, nry, dp, rr, rrr;
float nn, ct1, ct2;
float pt = R_TEMP;
@@ -1308,7 +1308,7 @@ void update_particles_i(pixel *vid, int start, int inc)
for(ny=CELL;ny<YRES-CELL;ny++)
{
r = pmap[ny][nx];
- int neighbors = gol2[nx][ny][0];
+ 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++)