matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix segfault with aray striking particles with abnormal ctype

Browse Source
This commit is contained in:
Simon Robertshaw 2011-06-25 22:44:07 +01:00
parent f3927f7202
commit 7351da3962
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/elements/aray.c
View File

@ -50,7 +50,7 @@ int update_ARAY(UPDATE_FUNC_ARGS) {
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 //Not sure why you changed checking "ctype" to "type"
if (!(nostop && (ptypes[parts[r>>8].ctype].properties&PROP_CONDUCTS))) {
if (!(nostop && parts[r>>8].ctype >= 0 && parts[r>>8].ctype < PT_NUM && (ptypes[parts[r>>8].ctype].properties&PROP_CONDUCTS))) {
docontinue = 0;
} else {
docontinue = 1;