summaryrefslogtreecommitdiff
path: root/src/elements
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2011-06-25 15:06:17 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2011-06-25 15:06:17 (GMT)
commit1a17e35c6fc19ff448186a32dc219beb06749898 (patch)
tree88580b32e70cb886aa1142f8c24af1ac07620aa7 /src/elements
parent34d76f86803138699b46f7e6252c11985ef481cf (diff)
downloadpowder-1a17e35c6fc19ff448186a32dc219beb06749898.zip
powder-1a17e35c6fc19ff448186a32dc219beb06749898.tar.gz
Change checking back to ctype for Aray condition
Diffstat (limited to 'src/elements')
-rw-r--r--src/elements/aray.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/elements/aray.c b/src/elements/aray.c
index 94729f4..b1a2e91 100644
--- a/src/elements/aray.c
+++ b/src/elements/aray.c
@@ -49,7 +49,8 @@ int update_ARAY(UPDATE_FUNC_ARGS) {
if (nyy!=0 || nxx!=0) {
create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK);
}
- if (!(nostop && (ptypes[r&0xFF].properties&PROP_CONDUCTS))) {//don't need to check r&0xFF<PT_NUM here because it should have been excluded by (r>>8)>=NPART
+ //if (!(nostop && (ptypes[r&0xFF].properties&PROP_CONDUCTS))) {//don't need to check r&0xFF<PT_NUM here because it should have been excluded by (r>>8)>=NPART //Not sure why you changed checking "ctype" to "type"
+ if (!(nostop && (ptypes[parts[r>>8].ctype].properties&PROP_CONDUCTS))) {
docontinue = 0;
} else {
docontinue = 1;