diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2011-06-24 21:55:59 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-06-25 14:59:30 (GMT) |
| commit | 34d76f86803138699b46f7e6252c11985ef481cf (patch) | |
| tree | 99c962bea2e407f70a20b1d69f1c453f2abfc04c /src/elements/aray.c | |
| parent | c18009dd9c87343178e808565d815b454bd2b585 (diff) | |
| download | powder-34d76f86803138699b46f7e6252c11985ef481cf.zip powder-34d76f86803138699b46f7e6252c11985ef481cf.tar.gz | |
Check photon map in Lua functions, and allow any ctype
Also add some extra checks on ctype in the rest of the game
Diffstat (limited to 'src/elements/aray.c')
| -rw-r--r-- | src/elements/aray.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/aray.c b/src/elements/aray.c index 4f94f00..94729f4 100644 --- a/src/elements/aray.c +++ b/src/elements/aray.c @@ -49,7 +49,7 @@ 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[parts[r>>8].ctype].properties&PROP_CONDUCTS))) { + 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 docontinue = 0; } else { docontinue = 1; |