From 8aaaae1daf36d52cfd924fc9afec89e14519bacb Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Thu, 3 Feb 2011 00:08:56 +0000 Subject: [PATCH] Make PTCT/NTCT cool down even when covered with spark Also fix typo in update_PHOT --- src/elements/phot.c | 4 ++-- 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 59e9cd8b9..a6a5d0714 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=0 && y+ry>=0 && x+rx>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 39f74975b..f107b9af6 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);