diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-07-09 19:09:29 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-07-09 19:09:29 (GMT) |
| commit | 61f39f5464f4f5d39c76f8427127e8998cc8e618 (patch) | |
| tree | 54b17c4f7d792aa172b22b83ff8a972b4deaa9cd /src/elements/conv.c | |
| parent | 3e1d3cd5a6382f1ad7dacee48cfee04188601670 (diff) | |
| download | powder-61f39f5464f4f5d39c76f8427127e8998cc8e618.zip powder-61f39f5464f4f5d39c76f8427127e8998cc8e618.tar.gz | |
Add ptypes.enabled checks to a few more places
Diffstat (limited to 'src/elements/conv.c')
| -rw-r--r-- | src/elements/conv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/elements/conv.c b/src/elements/conv.c index 9696d98..bdba369 100644 --- a/src/elements/conv.c +++ b/src/elements/conv.c @@ -17,7 +17,7 @@ int update_CONV(UPDATE_FUNC_ARGS) { int r, rx, ry; - if (parts[i].ctype<=0 || parts[i].ctype>=PT_NUM || (parts[i].ctype==PT_LIFE && (parts[i].tmp<0 || parts[i].tmp>=NGOLALT))) + if (parts[i].ctype<=0 || parts[i].ctype>=PT_NUM || !ptypes[parts[i].ctype].enabled || (parts[i].ctype==PT_LIFE && (parts[i].tmp<0 || parts[i].tmp>=NGOLALT))) { for (rx=-1; rx<2; rx++) for (ry=-1; ry<2; ry++) @@ -39,7 +39,7 @@ int update_CONV(UPDATE_FUNC_ARGS) { } } } - else if(parts[i].ctype>0 && parts[i].ctype<PT_NUM && parts[i].ctype!=PT_CONV) { + else if(parts[i].ctype>0 && parts[i].ctype<PT_NUM && ptypes[parts[i].ctype].enabled && parts[i].ctype!=PT_CONV) { 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) |