diff options
| author | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-03 00:08:56 (GMT) |
|---|---|---|
| committer | jacksonmj <jacksonmj@jacksonmj.none> | 2011-02-03 00:08:56 (GMT) |
| commit | 8aaaae1daf36d52cfd924fc9afec89e14519bacb (patch) | |
| tree | 41b47fba229cd649349de0de780bbc5a78c9b6ac /src | |
| parent | 9d716cba4719721e852028cf714ebb5143b9abb0 (diff) | |
| download | powder-8aaaae1daf36d52cfd924fc9afec89e14519bacb.zip powder-8aaaae1daf36d52cfd924fc9afec89e14519bacb.tar.gz | |
Make PTCT/NTCT cool down even when covered with spark
Also fix typo in update_PHOT
Diffstat (limited to 'src')
| -rw-r--r-- | src/elements/phot.c | 4 | ||||
| -rw-r--r-- | src/elements/sprk.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/elements/phot.c b/src/elements/phot.c index 59e9cd8..a6a5d07 100644 --- a/src/elements/phot.c +++ b/src/elements/phot.c @@ -6,8 +6,8 @@ int update_PHOT(UPDATE_FUNC_ARGS) { if (1>rand()%10) update_PYRO(UPDATE_FUNC_SUBCALL_ARGS); for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) - if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { - r = pmap[x+rx][y+ry]; + if (x+rx>=0 && y+ry>=0 && x+rx<XRES && y+ry<YRES && (rx || ry)) { + r = pmap[y+ry][x+rx]; if ((r>>8)>=NPART || !r) continue; if ((r&0xFF)==PT_ISOZ && 5>(rand()%2000)) diff --git a/src/elements/sprk.c b/src/elements/sprk.c index 39f7497..f107b9a 100644 --- a/src/elements/sprk.c +++ b/src/elements/sprk.c @@ -25,6 +25,10 @@ int update_SPRK(UPDATE_FUNC_ARGS) { kill_part(i); return 1; } + else if (ct==PT_NTCT || ct==PT_PTCT) + { + update_NPTCT(UPDATE_FUNC_SUBCALL_ARGS); + } else if (ct==PT_ETRD&&parts[i].life==1) { nearp = nearest_part(i, PT_ETRD); |