summaryrefslogtreecommitdiff
path: root/src/powder.c
diff options
context:
space:
mode:
authorSimon <simon@hardwired.org.uk>2011-02-03 15:37:55 (GMT)
committer Simon <simon@hardwired.org.uk>2011-02-03 15:37:55 (GMT)
commit525a59e28011cf26993c8e3f040a36ba7b7bf5e2 (patch)
tree00e958b7369643c60b7912120dd9e85efca2766e /src/powder.c
parentc78d4203eecb9cd90cf6dafc5aa61e6aa0adf09d (diff)
parentdb038e9643a99de5ddaba04d99eaceab91fc860d (diff)
downloadpowder-525a59e28011cf26993c8e3f040a36ba7b7bf5e2.zip
powder-525a59e28011cf26993c8e3f040a36ba7b7bf5e2.tar.gz
Fixes from cracker64, also lolsounds
Diffstat (limited to 'src/powder.c')
-rw-r--r--src/powder.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/powder.c b/src/powder.c
index 493dec7..6897cb1 100644
--- a/src/powder.c
+++ b/src/powder.c
@@ -577,7 +577,7 @@ inline int create_part(int p, int x, int y, int t)
if (t==PT_SPRK)
{
- if (!((pmap[y][x]&0xFF)==PT_INST||(ptypes[pmap[y][x]&0xFF].properties&PROP_CONDUCTS)))
+ if ((pmap[y][x]>>8)>=NPART || !((pmap[y][x]&0xFF)==PT_INST||(ptypes[pmap[y][x]&0xFF].properties&PROP_CONDUCTS)))
return -1;
if (parts[pmap[y][x]>>8].life!=0)
return -1;